[SCM] calf/master: Make the LV2-state stuff at least compile. Untested.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit dd3303e49d416a77baa5d9ab98a3b39cfa4b3566
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Wed Dec 14 00:16:30 2011 +0000

    Make the LV2-state stuff at least compile. Untested.

diff --git a/src/calf/lv2wrap.h b/src/calf/lv2wrap.h
index da94eed..f204db6 100644
--- a/src/calf/lv2wrap.h
+++ b/src/calf/lv2wrap.h
@@ -86,7 +86,7 @@ struct lv2_instance: public plugin_ctl_iface, public progress_report_iface
     void send_configures(send_configure_iface *sci) { 
         module->send_configures(sci);
     }
-    void impl_restore(LV2_Persist_Retrieve_Function retrieve, void *callback_data)
+    void impl_restore(LV2_State_Retrieve_Function retrieve, void *callback_data)
     {
         const char *const *vars = module->get_metadata_iface()->get_configure_vars();
         if (!vars)
@@ -182,7 +182,7 @@ struct lv2_wrapper
     typedef lv2_instance instance;
     static LV2_Descriptor descriptor;
     static LV2_Calf_Descriptor calf_descriptor;
-	static LV2_State_Interface state_iface;
+    static LV2_State_Interface state_iface;
     std::string uri;
     
     lv2_wrapper()
@@ -298,9 +298,9 @@ struct lv2_wrapper
             return &state_iface;
         return NULL;
     }
-	static void cb_state_save(LV2_Handle Instance,
-	                          LV2_State_Store_Function store, LV2_State_Handle handle,
-	                          uint32_t flags, const LV2_Feature *const * features)
+    static void cb_state_save(LV2_Handle Instance,
+                          LV2_State_Store_Function store, LV2_State_Handle handle,
+                          uint32_t flags, const LV2_Feature *const * features)
     {
         instance *const inst = (instance *)Instance;
         struct store_state: public send_configure_iface
@@ -324,7 +324,7 @@ struct lv2_wrapper
         assert(inst->uri_map);
         store_state s;
         s.store = store;
-        s.callback_data = callback_data;
+        s.callback_data = handle;
         s.inst = inst;
         s.string_data_type = inst->uri_map->uri_to_id(inst->uri_map->callback_data, NULL, "http://lv2plug.in/ns/ext/atom#String");
 
diff --git a/src/makerdf.cpp b/src/makerdf.cpp
index 93da68f..14b7cb8 100644
--- a/src/makerdf.cpp
+++ b/src/makerdf.cpp
@@ -419,7 +419,7 @@ void make_ttl(string path_prefix)
         
         if (pi->get_configure_vars())
         {
-            ttl += "    lv2:optionalFeature <" LV2_PERSIST_URI "> ;\n";
+            ttl += "    lv2:optionalFeature <" LV2_STATE_URI "> ;\n";
         }
         
         string ports = "";
diff --git a/src/plugin.cpp b/src/plugin.cpp
index ac26fd6..568df81 100644
--- a/src/plugin.cpp
+++ b/src/plugin.cpp
@@ -482,7 +482,7 @@ ladspa_plugin_metadata_set::~ladspa_plugin_metadata_set()
 // instantiate descriptor templates
 template<class Module> LV2_Descriptor calf_plugins::lv2_wrapper<Module>::descriptor;
 template<class Module> LV2_Calf_Descriptor calf_plugins::lv2_wrapper<Module>::calf_descriptor;
-template<class Module> LV2_Persist calf_plugins::lv2_wrapper<Module>::persist;
+template<class Module> LV2_State_Interface calf_plugins::lv2_wrapper<Module>::state_iface;
 
 extern "C" {
 

-- 
calf audio plugins packaging