[SCM] calf/master: Remove the forgotten leftover references to the old extensions.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit deb8b77bdb1e1648a38589b3be3d4d66175b4934
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Fri Sep 24 20:06:19 2010 +0100

    Remove the forgotten leftover references to the old extensions.

diff --git a/src/calf/lv2wrap.h b/src/calf/lv2wrap.h
index 8fda6d9..198b713 100644
--- a/src/calf/lv2wrap.h
+++ b/src/calf/lv2wrap.h
@@ -27,7 +27,6 @@
 #include <vector>
 #include <lv2.h>
 #include <calf/giface.h>
-#include <calf/lv2-midiport.h>
 #include <calf/lv2_event.h>
 #include <calf/lv2_persist.h>
 #include <calf/lv2_progress.h>
@@ -42,7 +41,6 @@ struct lv2_instance: public plugin_ctl_iface, public progress_report_iface
     audio_module_iface *module;
     bool set_srate;
     int srate_to_set;
-    LV2_MIDI *midi_data;
     LV2_Event_Buffer *event_data;
     LV2_URI_Map_Feature *uri_map;
     LV2_Event_Feature *event_feature;
@@ -60,7 +58,6 @@ struct lv2_instance: public plugin_ctl_iface, public progress_report_iface
         real_param_count = metadata->get_param_count();
         
         uri_map = NULL;
-        midi_data = NULL;
         event_data = NULL;
         progress_report_feature = NULL;
         midi_event_type = 0xFFFFFFFF;
diff --git a/src/lv2gui.cpp b/src/lv2gui.cpp
index afeab5c..efa95bc 100644
--- a/src/lv2gui.cpp
+++ b/src/lv2gui.cpp
@@ -24,7 +24,6 @@
 #endif
 #include <calf/giface.h>
 #include <calf/lv2_data_access.h>
-#include <calf/lv2_string_port.h>
 #include <calf/lv2_ui.h>
 #include <calf/lv2_uri_map.h>
 #include <calf/lv2_external_ui.h>
@@ -75,8 +74,6 @@ struct plugin_proxy_base
     int param_count;
     /// Number of the first parameter port
     int param_offset;
-    /// Mapped URI to string port
-    uint32_t string_port_uri;
     
     plugin_proxy_base(const plugin_metadata_iface *metadata, LV2UI_Write_Function wf, LV2UI_Controller c, const LV2_Feature* const* features);
 
@@ -111,7 +108,6 @@ plugin_proxy_base::plugin_proxy_base(const plugin_metadata_iface *metadata, LV2U
     instance_handle = NULL;
     data_access = NULL;
     ext_ui_host = NULL;
-    string_port_uri = 0;
     
     param_count = metadata->get_param_count();
     param_offset = metadata->get_param_port_offset();
@@ -135,11 +131,6 @@ plugin_proxy_base::plugin_proxy_base(const plugin_metadata_iface *metadata, LV2U
         {
             data_access = (LV2_Extension_Data_Feature *)features[i]->data;
         }
-        else if (!strcmp(features[i]->URI, LV2_URI_MAP_URI))
-        {
-            uri_map = (LV2_URI_Map_Feature *)features[i]->data;
-            string_port_uri = map_uri("http://lv2plug.in/ns/extensions/ui", LV2_STRING_PORT_URI);
-        }
         else if (!strcmp(features[i]->URI, LV2_EXTERNAL_UI_URI))
         {
             ext_ui_host = (lv2_external_ui_host *)features[i]->data;
diff --git a/src/makerdf.cpp b/src/makerdf.cpp
index bd43bfb..d9cd0db 100644
--- a/src/makerdf.cpp
+++ b/src/makerdf.cpp
@@ -21,7 +21,7 @@
 #include <calf/preset.h>
 #include <calf/utils.h>
 #if USE_LV2
-#include <calf/lv2_contexts.h>
+#include <lv2.h>
 #include <calf/lv2_event.h>
 #include <calf/lv2_persist.h>
 #include <calf/lv2_uri_map.h>

-- 
calf audio plugins packaging