summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-03-31 01:28:34 +0000
committerDavid Robillard <d@drobilla.net>2012-03-31 01:28:34 +0000
commite1e2b71074468a4bdd2a627caf37ad1a95196915 (patch)
tree4df503567860efc8e0a3c7c1cbe7f6b85a1235af
parent8480511a85d877d83239fbcaa9eb3f03c4375dff (diff)
downloadingen-e1e2b71074468a4bdd2a627caf37ad1a95196915.tar.gz
ingen-e1e2b71074468a4bdd2a627caf37ad1a95196915.tar.bz2
ingen-e1e2b71074468a4bdd2a627caf37ad1a95196915.zip
Update for latest LV2 state extension.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4134 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/server/LV2Node.cpp2
-rw-r--r--src/server/ingen_lv2.cpp14
2 files changed, 9 insertions, 7 deletions
diff --git a/src/server/LV2Node.cpp b/src/server/LV2Node.cpp
index 47c6459a..06f03eb0 100644
--- a/src/server/LV2Node.cpp
+++ b/src/server/LV2Node.cpp
@@ -169,7 +169,7 @@ LV2Node::instantiate(BufferFactory& bufs)
if (i == 0 && lilv_plugin_has_feature(plug, work_schedule)) {
_worker_iface = (LV2_Worker_Interface*)
lilv_instance_get_extension_data(instance(i),
- LV2_WORKER__Interface);
+ LV2_WORKER__interface);
}
}
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index 557dcc3e..3129ee36 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -526,7 +526,7 @@ get_state_features(const LV2_Feature* const* features,
}
}
-static void
+static LV2_State_Status
ingen_save(LV2_Handle instance,
LV2_State_Store_Function store,
LV2_State_Handle handle,
@@ -541,7 +541,7 @@ ingen_save(LV2_Handle instance,
if (!map_path || !make_path || !plugin->map) {
Raul::error << "Missing state:mapPath, state:makePath, or urid:Map."
<< endl;
- return;
+ return LV2_STATE_ERR_NO_FEATURE;
}
LV2_URID ingen_file = plugin->map->map(plugin->map->handle, NS_INGEN "file");
@@ -563,9 +563,10 @@ ingen_save(LV2_Handle instance,
free(state_path);
free(real_path);
+ return LV2_STATE_SUCCESS;
}
-static void
+static LV2_State_Status
ingen_restore(LV2_Handle instance,
LV2_State_Retrieve_Function retrieve,
LV2_State_Handle handle,
@@ -578,7 +579,7 @@ ingen_restore(LV2_Handle instance,
get_state_features(features, &map_path, NULL);
if (!map_path) {
Raul::error << "Missing state:mapPath" << endl;
- return;
+ return LV2_STATE_ERR_NO_FEATURE;
}
LV2_URID ingen_file = plugin->map->map(plugin->map->handle, NS_INGEN "file");
@@ -592,7 +593,7 @@ ingen_restore(LV2_Handle instance,
if (!path) {
Raul::error << "Failed to restore ingen:file" << endl;
- return;
+ return LV2_STATE_ERR_NO_PROPERTY;
}
const char* state_path = (const char*)path;
@@ -602,13 +603,14 @@ ingen_restore(LV2_Handle instance,
plugin->world->engine().get(),
real_path);
free(real_path);
+ return LV2_STATE_SUCCESS;
}
const void*
ingen_extension_data(const char* uri)
{
static const LV2_State_Interface state = { ingen_save, ingen_restore };
- if (!strcmp(uri, LV2_STATE__Interface)) {
+ if (!strcmp(uri, LV2_STATE__interface)) {
return &state;
}
return NULL;