Merge with master

4 files changed, 215 insertions, 1 deletions

diff --git a/autogen.sh b/autogen.sh
index c027031..c0b9008 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 # Check if hugin has been obtained:
-if [ ! -d hugin ]
+if [ ! -f hugin/hugin.c ]
 then
 		echo "You are missing the hugin submodule."
 		echo "Run"
diff --git a/plugingui/pluginconfig.cc b/plugingui/pluginconfig.cc
new file mode 100644
index 0000000..d57d9df
--- /dev/null
+++ b/plugingui/pluginconfig.cc
@@ -0,0 +1,165 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            config.cc
+ *
+ *  Tue Jun  3 13:54:05 CEST 2014
+ *  Copyright 2014 Jonas Suhr Christensen
+ *  jsc@umbraculum.org
+ ****************************************************************************/
+
+/*
+ *  This file is part of DrumGizmo.
+ *
+ *  DrumGizmo is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  DrumGizmo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with DrumGizmo; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ */
+#include "pluginconfig.h"
+
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "directory.h"
+
+#ifdef WIN32
+#include <direct.h>
+#include <windows.h>
+#include <Shlobj.h>
+#include <Shlwapi.h>
+#else
+#endif
+
+#include <hugin.hpp>
+  
+#define CONFIGFILENAME "plugingui.conf"
+
+#ifdef WIN32
+  #define SEP "\\"
+  #define CONFIGDIRNAME ".drumgizmo"
+#else
+  #define SEP "/"
+  #define CONFIGDIRNAME ".drumgizmo"
+#endif
+
+Config::Config()
+{
+
+}
+
+Config::~Config()
+{
+
+}
+
+static std::string configPath() {
+ #ifdef WIN32
+  std::string configpath;
+  TCHAR szPath[256];
+  if(SUCCEEDED(SHGetFolderPath(NULL,
+                               CSIDL_APPDATA | CSIDL_FLAG_CREATE,
+                               NULL,
+                               0,
+                               szPath))); {
+    configpath = szPath;
+  }
+#else
+  std::string configpath = strdup(getenv("HOME"));
+#endif
+  configpath += SEP;
+  configpath += CONFIGDIRNAME;
+
+  return configpath;
+}
+
+static bool createConfigPath() {
+  std::string configpath = configPath();
+
+  if(!Directory::exists(configpath)) {
+    DEBUG(pluginconfig, "No configuration exists, creating directory '%s'\n", configpath.c_str());
+#ifdef WIN32
+    if( (mkdir(configpath.c_str())) < 0) { 
+#else
+    if( (mkdir(configpath.c_str(), 0755)) < 0) { 
+#endif
+      DEBUG(pluginconfig, "Could not create config directory\n");
+    }
+    return false;
+  }
+
+  return true;
+}
+
+static FILE* openConfigFile(std::string mode) {
+
+  std::string configpath = configPath();
+
+  FILE *fp;
+  std::string configfile = configpath;
+  configfile += SEP;
+  configfile += CONFIGFILENAME;
+
+  DEBUG(pluginconfig, "Opening config file '%s'\n", configfile.c_str());
+  if(! (fp = fopen(configfile.c_str(), mode.c_str())) ) {
+    return NULL;
+  }
+
+  return fp;
+}
+
+void Config::load()
+{
+  DEBUG(pluginconfig, "Loading config file...\n");
+  FILE *fp = openConfigFile("r");
+  if(!fp) return;
+
+  lastkit.clear();
+  lastmidimap.clear();
+
+  char buf[4096];
+  while( fgets(buf, 4096, fp) ) {
+    if(!strncmp(buf, "lastkit:", 8)) {
+      DEBUG(pluginconfig, "Loading last kit path\n");
+      // Dont copy newline
+      if(strlen(buf) > 8 + 1) { 
+        lastkit.append(buf+8, strlen(buf+8) - 1);
+        DEBUG(pluginconfig, "\t path is %s\n", lastkit.c_str());
+      }
+    }
+    if(!strncmp(buf, "lastmidimap:", 12)) {
+      DEBUG(pluginconfig, "Loading lastmidimap path\n");
+      // Dont copy newline
+      if(strlen(buf) > 12+1) lastmidimap.append(buf+12, strlen(buf+12) - 1);
+      DEBUG(pluginconfig, "\t path is %s\n", lastmidimap.c_str());
+    }
+  }
+}
+
+void Config::save()
+{
+  DEBUG(pluginconfig, "Saving configuration...\n");
+
+  createConfigPath();
+
+  FILE *fp = openConfigFile("w");
+  if(!fp) return;
+
+  std::string buf;
+  buf.append("lastkit:" + lastkit + '\n');
+  buf.append("lastmidimap:" + lastmidimap + '\n');
+
+  fputs(buf.c_str(), fp);
+
+  fclose(fp);
+}
diff --git a/plugingui/pluginconfig.h b/plugingui/pluginconfig.h
new file mode 100644
index 0000000..d0e9bcd
--- /dev/null
+++ b/plugingui/pluginconfig.h
@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            config.h
+ *
+ *  Tue Jun  3 13:51:29 CEST 2014
+ *  Copyright 2014 Jonas Suhr Christensen
+ *  jsc@umbraculum.org
+ ****************************************************************************/
+
+/*
+ *  This file is part of DrumGizmo.
+ *
+ *  DrumGizmo is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  DrumGizmo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with DrumGizmo; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ */
+#ifndef __DRUMGIZMO_CONFIG_H__
+#define __DRUMGIZMO_CONFIG_H__
+
+#include <string>
+#include <list>
+
+#define DIRECTORY_HIDDEN 1
+
+class Config {
+
+  public:
+    Config();
+    ~Config();
+
+    void load();
+    void save();
+
+    std::string lastkit;
+    std::string lastmidimap;
+};
+
+#endif/*__DRUMGIZMO_CONFIG_H__*/
diff --git a/vst/Makefile.mingw32.in b/vst/Makefile.mingw32.in
index 76154f9..f8aab4d 100644
--- a/vst/Makefile.mingw32.in
+++ b/vst/Makefile.mingw32.in
@@ -39,6 +39,7 @@ GUI_SRC = \
 	@top_srcdir@/plugingui/nativewindow_x11.cc \
 	@top_srcdir@/plugingui/nativewindow_win32.cc \
 	@top_srcdir@/plugingui/plugingui.cc \
+	@top_srcdir@/plugingui/pluginconfig.cc \
 	@top_srcdir@/plugingui/label.cc \
 	@top_srcdir@/plugingui/eventhandler.cc \
 	@top_srcdir@/plugingui/font.cc \