aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-03-16 14:20:59 +0000
committerDavid Robillard <d@drobilla.net>2012-03-16 14:20:59 +0000
commit76db28f38dc47d096d8e055030e866630d643849 (patch)
tree0282f29e3a88dc22de6a35935f6c43d3c524772a
parent8a4485764e3ad67715b9043e6b7e3d3f7cd4eecf (diff)
downloadlv2-76db28f38dc47d096d8e055030e866630d643849.tar.xz
Update for patch extension.
-rw-r--r--plugins/eg-sampler.lv2/sampler.c4
-rw-r--r--plugins/eg-sampler.lv2/sampler.ttl4
-rw-r--r--plugins/eg-sampler.lv2/sampler_ui.c4
-rw-r--r--plugins/eg-sampler.lv2/uris.h24
-rw-r--r--plugins/eg-sampler.lv2/wscript4
5 files changed, 20 insertions, 20 deletions
diff --git a/plugins/eg-sampler.lv2/sampler.c b/plugins/eg-sampler.lv2/sampler.c
index d29f319..ec59ef3 100644
--- a/plugins/eg-sampler.lv2/sampler.c
+++ b/plugins/eg-sampler.lv2/sampler.c
@@ -41,7 +41,7 @@
#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
#include "lv2/lv2plug.in/ns/ext/atom/util.h"
-#include "lv2/lv2plug.in/ns/ext/message/message.h"
+#include "lv2/lv2plug.in/ns/ext/patch/patch.h"
#include "lv2/lv2plug.in/ns/ext/state/state.h"
#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
@@ -340,7 +340,7 @@ run(LV2_Handle instance,
}
} else if (is_object_type(uris, ev->body.type)) {
const LV2_Atom_Object* obj = (LV2_Atom_Object*)&ev->body;
- if (obj->body.otype == uris->msg_Set) {
+ if (obj->body.otype == uris->patch_Set) {
/* Received a set message, send it to the worker thread. */
fprintf(stderr, "Queueing set message\n");
zix_ring_write(plugin->to_worker,
diff --git a/plugins/eg-sampler.lv2/sampler.ttl b/plugins/eg-sampler.lv2/sampler.ttl
index e2cbb10..fa93ba4 100644
--- a/plugins/eg-sampler.lv2/sampler.ttl
+++ b/plugins/eg-sampler.lv2/sampler.ttl
@@ -35,7 +35,7 @@
atom:MessagePort ;
atom:bufferType atom:Sequence ;
atom:supports <http://lv2plug.in/ns/ext/midi#MidiEvent> ,
- <http://lv2plug.in/ns/ext/message#Message> ;
+ <http://lv2plug.in/ns/ext/patch#Message> ;
lv2:index 0 ;
lv2:symbol "control" ;
lv2:name "Control"
@@ -43,7 +43,7 @@
a lv2:OutputPort ,
atom:MessagePort ;
atom:bufferType atom:Sequence ;
- atom:supports <http://lv2plug.in/ns/ext/message#Message> ;
+ atom:supports <http://lv2plug.in/ns/ext/patch#Message> ;
lv2:index 1 ;
lv2:symbol "notify" ;
lv2:name "Notify"
diff --git a/plugins/eg-sampler.lv2/sampler_ui.c b/plugins/eg-sampler.lv2/sampler_ui.c
index cdc11b3..c2380eb 100644
--- a/plugins/eg-sampler.lv2/sampler_ui.c
+++ b/plugins/eg-sampler.lv2/sampler_ui.c
@@ -23,10 +23,10 @@
#include <gtk/gtk.h>
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
-#include "lv2/lv2plug.in/ns/ext/message/message.h"
+#include "lv2/lv2plug.in/ns/ext/atom/util.h"
+#include "lv2/lv2plug.in/ns/ext/patch/patch.h"
#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
diff --git a/plugins/eg-sampler.lv2/uris.h b/plugins/eg-sampler.lv2/uris.h
index cec1700..0d04754 100644
--- a/plugins/eg-sampler.lv2/uris.h
+++ b/plugins/eg-sampler.lv2/uris.h
@@ -37,8 +37,8 @@ typedef struct {
LV2_URID eg_file;
LV2_URID eg_freeSample;
LV2_URID midi_Event;
- LV2_URID msg_Set;
- LV2_URID msg_body;
+ LV2_URID patch_Set;
+ LV2_URID patch_body;
} SamplerURIs;
static inline void
@@ -53,8 +53,8 @@ map_sampler_uris(LV2_URID_Map* map, SamplerURIs* uris)
uris->eg_file = map->map(map->handle, EG_SAMPLER__file);
uris->eg_freeSample = map->map(map->handle, EG_SAMPLER__freeSample);
uris->midi_Event = map->map(map->handle, LV2_MIDI__MidiEvent);
- uris->msg_Set = map->map(map->handle, LV2_MESSAGE__Set);
- uris->msg_body = map->map(map->handle, LV2_MESSAGE__body);
+ uris->patch_Set = map->map(map->handle, LV2_PATCH__Set);
+ uris->patch_body = map->map(map->handle, LV2_PATCH__body);
}
static inline bool
@@ -67,8 +67,8 @@ is_object_type(const SamplerURIs* uris, LV2_URID type)
/**
* Write a message like the following to @p forge:
* [
- * a msg:Set ;
- * msg:body [
+ * a patch:Set ;
+ * patch:body [
* eg-sampler:file </home/me/foo.wav> ;
* ] ;
* ]
@@ -81,9 +81,9 @@ write_set_file(LV2_Atom_Forge* forge,
{
LV2_Atom_Forge_Frame set_frame;
LV2_Atom* set = (LV2_Atom*)lv2_atom_forge_blank(
- forge, &set_frame, 1, uris->msg_Set);
+ forge, &set_frame, 1, uris->patch_Set);
- lv2_atom_forge_property_head(forge, uris->msg_body, 0);
+ lv2_atom_forge_property_head(forge, uris->patch_body, 0);
LV2_Atom_Forge_Frame body_frame;
lv2_atom_forge_blank(forge, &body_frame, 2, 0);
@@ -99,8 +99,8 @@ write_set_file(LV2_Atom_Forge* forge,
/**
* Get the file path from a message like:
* [
- * a msg:Set ;
- * msg:body [
+ * a patch:Set ;
+ * patch:body [
* eg-sampler:file </home/me/foo.wav> ;
* ] ;
* ]
@@ -109,14 +109,14 @@ static inline const LV2_Atom*
read_set_file(const SamplerURIs* uris,
const LV2_Atom_Object* obj)
{
- if (obj->body.otype != uris->msg_Set) {
+ if (obj->body.otype != uris->patch_Set) {
fprintf(stderr, "Ignoring unknown message type %d\n", obj->body.otype);
return NULL;
}
/* Get body of message. */
const LV2_Atom_Object* body = NULL;
- lv2_object_get(obj, uris->msg_body, &body, 0);
+ lv2_object_get(obj, uris->patch_body, &body, 0);
if (!body) {
fprintf(stderr, "Malformed set message has no body.\n");
return NULL;
diff --git a/plugins/eg-sampler.lv2/wscript b/plugins/eg-sampler.lv2/wscript
index b83bd6d..c25b28d 100644
--- a/plugins/eg-sampler.lv2/wscript
+++ b/plugins/eg-sampler.lv2/wscript
@@ -27,10 +27,10 @@ def configure(conf):
uselib_store='LV2_URID')
autowaf.check_pkg(conf, 'lv2-lv2plug.in-ns-ext-atom',
uselib_store='LV2_ATOM')
+ autowaf.check_pkg(conf, 'lv2-lv2plug.in-ns-ext-patch',
+ uselib_store='LV2_PATCH')
autowaf.check_pkg(conf, 'lv2-lv2plug.in-ns-ext-state',
uselib_store='LV2_STATE')
- autowaf.check_pkg(conf, 'lv2-lv2plug.in-ns-ext-message',
- uselib_store='LV2_MESSAGE')
conf.check(function_name='mlock',
header_name='sys/mman.h',