From bcfb35ac4eb353659222f8fd00238c61b960cfc6 Mon Sep 17 00:00:00 2001
From: Harry van Haaren <harryhaaren@gmail.com>
Date: Tue, 24 Sep 2013 18:45:54 +0100
Subject: [PATCH] -Updated GenericMidi controller

---
 build/run.sh                   | 2 +-
 src/controller/genericmidi.cxx | 6 +++---
 src/jack.cxx                   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/run.sh b/build/run.sh
index 36c3be2..f84cdae 100755
--- a/build/run.sh
+++ b/build/run.sh
@@ -2,4 +2,4 @@
 
 #./src/luppp
 
-xterm -e "sleep 1 && aj-snapshot -r lupppDemo" & src/luppp
+xterm -e "sleep 1 && aj-snapshot -r lupppDemo" & cd src/ && ./luppp
diff --git a/src/controller/genericmidi.cxx b/src/controller/genericmidi.cxx
index 418a6aa..748d462 100644
--- a/src/controller/genericmidi.cxx
+++ b/src/controller/genericmidi.cxx
@@ -363,15 +363,15 @@ int GenericMIDI::loadController( std::string file )
     }
     else
     {
-      cout << "Warning: audio.cfg has no entry for beats." << endl;
+      cout << "Warning: controller.cfg has no entry for MIDI inputs." << endl;
     }
     
     cJSON_Delete( controllerJson );
-    free ( sampleString  );
+    delete[] sampleString;
   }
   else
   {
-    LUPPP_WARN("%s %s","No controller definition found in ", file.c_str() );
+    LUPPP_WARN("%s %s","No controller file found at ", file.c_str() );
     return LUPPP_RETURN_WARNING;
   }
   
diff --git a/src/jack.cxx b/src/jack.cxx
index da2032d..ab3a651 100644
--- a/src/jack.cxx
+++ b/src/jack.cxx
@@ -156,7 +156,7 @@ Jack::~Jack()
 void Jack::activate()
 {
   Controller* c = new AkaiAPC();
-  Controller* m = new GenericMIDI("testPath","testName");
+  Controller* m = new GenericMIDI("testController.cfg","testName");
   
   Controller* g = new LupppGUI();