-Refactoring GenericMIDI

src/controller/genericmidi.cxx

@@ -20,6 +20,8 @@ GenericMIDI::GenericMIDI(std::string file, std::string name) :
   // load the JSON config file
   loadController( file );
   
+  
+  
   // register the JACK MIDI ports
   //registerPorts( name );
   // FIXME: this port is the input port, gotta fix the output port ID number
@@ -399,14 +401,10 @@ int GenericMIDI::loadController( std::string file )
       return LUPPP_RETURN_ERROR;
     }
     
-    cJSON* control = cJSON_GetObjectItem( controllerJson, "midiIn" );
-    if ( control )
+    cJSON* name = cJSON_GetObjectItem( controllerJson, "name" );
+    if ( name )
     {
-      LUPPP_NOTE("%s,%i","num MIDI inputs: ", control->valueint );
-    }
-    else
-    {
-      cout << "Warning: controller.ctlr has no entry for MIDI inputs." << endl;
+      LUPPP_NOTE("Device %s", name->valuestring );
     }
     
     

src/observer/midi.cxx

@@ -9,8 +9,3 @@ MidiObserver::MidiObserver()
 {
   
 }
-
-void MidiObserver::registerPorts( std::string portName )
-{
-  //jack->registerMidiObserver( this, portName );
-}

src/observer/midi.hxx

@@ -9,7 +9,7 @@ class Jack;
 extern Jack* jack;
 
 /** MidiObserver
- *  A base class allowing the recieving of MIDI message streams to the subclass
+ *  A base class for obseriving a MIDI port
 **/
 class MidiObserver
 {
@@ -17,9 +17,6 @@ class MidiObserver
     MidiObserver();
     virtual ~MidiObserver(){};
     
-    /// registers class with jack's MIDI handling, with MIDI port name
-    void registerPorts( std::string portName );
-    
     /// name string to show in UI
     virtual std::string getName() = 0;