diff options
author | David Robillard <d@drobilla.net> | 2011-11-09 05:00:23 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-11-09 05:00:23 +0000 |
commit | ace240c59b4d687118950f8107ec3ed3e1e04ece (patch) | |
tree | 6cd5f00b510e8b70a8b319cdbbf84a06a72b4d80 | |
parent | af376456335423225fbcf897c1b3e676abdf3ba0 (diff) | |
download | ingen-ace240c59b4d687118950f8107ec3ed3e1e04ece.tar.gz ingen-ace240c59b4d687118950f8107ec3ed3e1e04ece.tar.bz2 ingen-ace240c59b4d687118950f8107ec3ed3e1e04ece.zip |
Update for changes in LV2 SVN.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3608 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r-- | include/ingen/shared/URIs.hpp | 4 | ||||
-rw-r--r-- | src/client/PortModel.cpp | 2 | ||||
-rw-r--r-- | src/gui/Port.cpp | 2 | ||||
-rw-r--r-- | src/server/LV2Node.cpp | 6 | ||||
-rw-r--r-- | src/server/PortImpl.cpp | 2 | ||||
-rw-r--r-- | src/shared/URIs.cpp | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/include/ingen/shared/URIs.hpp b/include/ingen/shared/URIs.hpp index 39faa83b..e68f3e33 100644 --- a/include/ingen/shared/URIs.hpp +++ b/include/ingen/shared/URIs.hpp @@ -47,9 +47,9 @@ public: const Quark atom_ValuePort; const Quark atom_Vector; const Quark atom_supports; - const Quark ctx_AudioContext; - const Quark ctx_MessageContext; + const Quark ctx_audioContext; const Quark ctx_context; + const Quark ctx_messageContext; const Quark doap_name; const Quark ev_EventPort; const Quark ingen_Internal; diff --git a/src/client/PortModel.cpp b/src/client/PortModel.cpp index c017287f..55051bf1 100644 --- a/src/client/PortModel.cpp +++ b/src/client/PortModel.cpp @@ -64,7 +64,7 @@ bool PortModel::has_context(const Raul::URI& uri) const { const Raul::Atom& context = get_property(_uris.ctx_context); - if (uri == _uris.ctx_AudioContext && !context.is_valid()) + if (uri == _uris.ctx_audioContext && !context.is_valid()) return true; else return context == uri; diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp index abe22507..f4c00b15 100644 --- a/src/gui/Port.cpp +++ b/src/gui/Port.cpp @@ -285,7 +285,7 @@ Port::dash() if (!pm) return NULL; - if (pm->has_context(uris.ctx_AudioContext)) + if (pm->has_context(uris.ctx_audioContext)) return NULL; if (!_dash) { diff --git a/src/server/LV2Node.cpp b/src/server/LV2Node.cpp index 1dc64aaa..91226c7b 100644 --- a/src/server/LV2Node.cpp +++ b/src/server/LV2Node.cpp @@ -152,7 +152,7 @@ LV2Node::instantiate(BufferFactory& bufs) uint32_t port_buffer_size = 0; LilvNode* ctx_ext_uri = lilv_new_uri(info->lv2_world(), - LV2_CONTEXTS_URI "#MessageContext"); + LV2_CONTEXTS_URI "#messageContext"); for (uint32_t i = 0; i < _polyphony; ++i) { (*_instances)[i] = SharedPtr<void>( @@ -169,7 +169,7 @@ LV2Node::instantiate(BufferFactory& bufs) continue; const void* ctx_ext = lilv_instance_get_extension_data( - instance(i), LV2_CONTEXTS_URI "#MessageContext"); + instance(i), LV2_CONTEXTS_URI "#messageContext"); if (i == 0 && ctx_ext) { assert(!_message_funcs); @@ -321,7 +321,7 @@ LV2Node::instantiate(BufferFactory& bufs) LILV_FOREACH(nodes, i, contexts) { const LilvNode* c = lilv_nodes_get(contexts, i); const char* context = lilv_node_as_string(c); - if (!strcmp(LV2_CONTEXTS_URI "#MessageContext", context)) { + if (!strcmp(LV2_CONTEXTS_URI "#messageContext", context)) { if (!_message_funcs) { warn << _lv2_plugin->uri() << " has a message port, but no context extension data." << endl; diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp index a5f74f27..2aef6f5e 100644 --- a/src/server/PortImpl.cpp +++ b/src/server/PortImpl.cpp @@ -246,7 +246,7 @@ PortImpl::set_context(Context::ID c) remove_property(uris.ctx_context, uris.wildcard); break; case Context::MESSAGE: - set_property(uris.ctx_context, uris.ctx_MessageContext); + set_property(uris.ctx_context, uris.ctx_messageContext); break; } } diff --git a/src/shared/URIs.cpp b/src/shared/URIs.cpp index 869aa26e..cd578846 100644 --- a/src/shared/URIs.cpp +++ b/src/shared/URIs.cpp @@ -64,9 +64,9 @@ URIs::URIs() , atom_ValuePort (LV2_ATOM_URI "#ValuePort") , atom_Vector (LV2_ATOM_URI "#Vector") , atom_supports (LV2_ATOM_URI "#supports") - , ctx_AudioContext (NS_CTX "AudioContext") - , ctx_MessageContext (NS_CTX "MessageContext") + , ctx_audioContext (NS_CTX "audioContext") , ctx_context (NS_CTX "context") + , ctx_messageContext (NS_CTX "messageContext") , doap_name ("http://usefulinc.com/ns/doap#name") , ev_EventPort ("http://lv2plug.in/ns/ext/event#EventPort") , ingen_Internal (NS_INGEN "Internal") |