Bug fix

include/utils.h

@@ -34,8 +34,8 @@ class Args
         Args(int ac, char** argv);
         virtual ~Args(){}
 
-        std::string config_file;
-        std::string pad_file;
+		std::string config_file;
+		std::string pad_file;
         std::string override_app_dir;
         std::string override_pad_dir;
         bool        continue_app;

src/Config.cpp

@@ -164,40 +164,4 @@ void Config::_set(const std::string& _path, Json::Value val)
     *v=val;
 }
 
-/*
- * cmake_minimum_required(VERSION 3.5)
-
-project(simplemidi LANGUAGES CXX)
-
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-set(src main.cpp
-	src/MidiPort.cpp
-	src/AbsInput.cpp
-	src/utils.cpp
-	src/Application.cpp
-	src/InputDefinition.cpp
-	src/IInputEventListener.cpp
-	src/Pad.cpp
-	src/Button.cpp
-	src/commands.cpp
-	src/InputAction.cpp
-	src/MidiMessage.cpp
-	src/PadSelection.cpp
-	src/Operations.cpp
-	src/PadConfiguration.cpp
-	src/Command.cpp
-	src/Socket.cpp
-	src/PadManager.cpp
-	src/Config.cpp
-	src/PadDefinition.cpp)
-
-
-add_executable(simplemidi ${src})
-include_directories(include)
-include_directories(/usr/include/rtmidi)
-target_link_libraries(simplemidi /usr/lib/libjsoncpp.so)
-target_link_libraries(simplemidi /usr/lib/librtmidi.so)
-
-*/
+

src/utils.cpp

@@ -217,15 +217,12 @@ Args::Args(int argc, char** argv)
                 i+=((args_fucntion)ARGS_FUNCTION_LIST[j][2])(this, argv+i+1);
                 break;
             }
-        }
-        if(j==l){
-            pad_file=argv[i];
-            return;
-        }
-    }
-    if(pad_file==""){
-        print_help(this, NULL);
-    }
+		}
+		if(j==l){
+			pad_file=argv[i];
+			return;
+		}
+	}
 }
 
 bool Fs::exists(const std::string& path)

ui/application.py

@@ -520,7 +520,6 @@ class SelectionPane(Pane):
         self.modifying=True
         self.pad=pad
         self.sel_list.init()
-        print(self.sel_list.get_children())
         for k in self.pad.selections:
             self.sel_list.append(k, self.pad.selections[k])
 
@@ -682,5 +681,5 @@ class Application:
 
 
 app = Application()
-app.open("conf3.conf")
+app.open("../conf/conf3.conf")
 app.main()

ui/config.py

@@ -1,4 +1,4 @@
 
 
 PAD_DIRECTORY="../pads"
-PAD_ROUTER_BIN="./simplemidi"
+PAD_ROUTER_BIN="../build/debug/simplemidi"

ui/simplemidi.py

@@ -124,7 +124,8 @@ class SimpleMidi:
         if not self.connect and not self.is_alive():
             padsdir = os.path.normpath(os.path.join(os.getcwd(), "../pads"))
             args=(os.path.join(os.getcwd(), config.PAD_ROUTER_BIN), "--command", "inet", "8081", "-k", "--pads-dir", padsdir)
-            self.process=subprocess.Popen(args)
+            fd = open("_stderr", "wb")
+            self.process=subprocess.Popen(args, stderr=fd)
             """if (self.pid>0):
                 os.kill(self.pid, 9)
                 os.wait()
@@ -174,6 +175,8 @@ class SimpleMidi:
         with open(SimpleMidi.TEMP_FILE, "w") as f:
             f.write(json.dumps(padconf.json()))
         self.socket.set_configuration("ui/"+SimpleMidi.TEMP_FILE)
+        time.sleep(0.1)
+        os.remove(SimpleMidi.TEMP_FILE)
 
     def set_configuration_file(self, padconf):
         if not self.is_alive():