New message system. New common midi input class. Some compiler warning fixes. New ListBoxBasic class used by both LustBox and ComboBox. New embossed font.

4 files changed, 6 insertions, 20 deletions

diff --git a/lv2/input_lv2.cc b/lv2/input_lv2.cc
index 11e79a6..0d97760 100644
--- a/lv2/input_lv2.cc
+++ b/lv2/input_lv2.cc
@@ -61,6 +61,7 @@ void InputLV2::stop()
 void InputLV2::pre()
 {
 }
+
 event_t *InputLV2::run(size_t pos, size_t len, size_t *nevents)
 {
   event_t *list;
@@ -114,18 +115,6 @@ void InputLV2::post()
 {
 }
 
-void InputLV2::loadMidiMap(std::string f)
-{
-  if(f == "") return;
-  MidiMapParser p(f);
-  if(p.parse()) {/*return false;*/}
-  mmap.midimap = p.midimap;
-
-  for(size_t i = 0; i < instruments->size(); i++) {
-    mmap.instrmap[(*instruments)[i]->name()] = i;
-  }
-}
-
 #ifdef TEST_INPUT_LV2
 //Additional dependency files
 //deps:
diff --git a/lv2/input_lv2.h b/lv2/input_lv2.h
index 00e0b51..aa39a23 100644
--- a/lv2/input_lv2.h
+++ b/lv2/input_lv2.h
@@ -27,12 +27,11 @@
 #ifndef __DRUMGIZMO_INPUT_LV2_H__
 #define __DRUMGIZMO_INPUT_LV2_H__
 
-#include <audioinputengine.h>
-#include <midimapper.h>
+#include <audioinputenginemidi.h>
 
 #include <lv2/lv2plug.in/ns/ext/event/event-helpers.h>
 
-class InputLV2 : public AudioInputEngine {
+class InputLV2 : public AudioInputEngineMidi {
 public:
   InputLV2();
   ~InputLV2();
@@ -48,12 +47,8 @@ public:
   event_t *run(size_t pos, size_t len, size_t *nevents);
   void post();
 
-  void loadMidiMap(std::string file);
-
   LV2_Event_Buffer *eventPort;
 
-  MidiMapper mmap;
-
 private:
   Instruments *instruments;
 };
diff --git a/lv2/lv2.cc b/lv2/lv2.cc
index 4916cf2..dd2a059 100644
--- a/lv2/lv2.cc
+++ b/lv2/lv2.cc
@@ -161,7 +161,7 @@ dg_restore(LV2_Handle                  instance,
     std::string config;
     config.append(data, size - 1);
     dglv2->dg->setConfigString(config);
-    dglv2->in->loadMidiMap(dglv2->dg->midimapfile);
+    //dglv2->in->loadMidiMap(dglv2->dg->midimapfile);
   }
  
   /*
diff --git a/lv2/lv2_gui.cc b/lv2/lv2_gui.cc
index 5524a76..afd47a2 100644
--- a/lv2/lv2_gui.cc
+++ b/lv2/lv2_gui.cc
@@ -151,6 +151,7 @@ static void closeHandler(void *ptr)
 
 static void midimapHandler(void *ptr, const char* file)
 {
+  /*
   printf("> midimapHandler %s\n", file);
   struct DG_GUI *gui = (struct DG_GUI *)ptr;
   gui->instance->midimapfile = file;
@@ -159,6 +160,7 @@ static void midimapHandler(void *ptr, const char* file)
   dglv2->in->loadMidiMap(file);
 
   printf("< midimapHandler\n");
+  */
 }
 
 static LV2UI_Handle ui_instantiate(const struct _LV2UI_Descriptor * descriptor,