Merge remote-tracking branch 'origin' into diskstreaming

Conflicts:
	src/Makefile.am.drumgizmo
	src/drumgizmo.h

1 files changed, 9 insertions, 13 deletions

diff --git a/plugingui/pluginconfig.h b/plugingui/pluginconfig.h
index d0e9bcd..29d2ef5 100644
--- a/plugingui/pluginconfig.h
+++ b/plugingui/pluginconfig.h
@@ -27,22 +27,18 @@
 #ifndef __DRUMGIZMO_CONFIG_H__
 #define __DRUMGIZMO_CONFIG_H__
 
-#include <string>
-#include <list>
+#include <configfile.h>
 
-#define DIRECTORY_HIDDEN 1
+class Config : public ConfigFile {
+public:
+  Config();
+  ~Config();
 
-class Config {
+  void load();
+  void save();
 
-  public:
-    Config();
-    ~Config();
-
-    void load();
-    void save();
-
-    std::string lastkit;
-    std::string lastmidimap;
+  std::string lastkit;
+  std::string lastmidimap;
 };
 
 #endif/*__DRUMGIZMO_CONFIG_H__*/