diff options
author | David Robillard <d@drobilla.net> | 2015-04-03 17:10:58 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2015-04-03 17:10:58 +0000 |
commit | e1ea99192e10149e0cac7a93f98fbec20e7cedb2 (patch) | |
tree | 97d8d9e63b6d2085c2b49e71fc2183c8058b4533 /src/client | |
parent | ac888fe3cb4a7bdf0f43e9474160e3b525edf774 (diff) | |
download | ingen-e1ea99192e10149e0cac7a93f98fbec20e7cedb2.tar.gz ingen-e1ea99192e10149e0cac7a93f98fbec20e7cedb2.tar.bz2 ingen-e1ea99192e10149e0cac7a93f98fbec20e7cedb2.zip |
Use lv2:prototype and deprecate ingen:prototype.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5652 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client')
-rw-r--r-- | src/client/ClientStore.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index a61d511a..a260cb07 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -280,7 +280,11 @@ ClientStore::put(const Raul::URI& uri, model->set_properties(properties); add_object(model); } else if (is_block) { - const Iterator p = properties.find(_uris.ingen_prototype); + Iterator p = properties.find(_uris.lv2_prototype); + if (p == properties.end()) { + p = properties.find(_uris.ingen_prototype); + } + SPtr<PluginModel> plug; if (p->second.is_valid() && p->second.type() == _uris.forge.URI) { if (!(plug = _plugin(Raul::URI(p->second.ptr<char>())))) { @@ -297,8 +301,7 @@ ClientStore::put(const Raul::URI& uri, bm->set_properties(properties); add_object(bm); } else { - _log.warn(fmt("Block %1% has no prototype\n") - % path.c_str()); + _log.warn(fmt("Block %1% has no prototype\n") % path.c_str()); } } else if (is_port) { PortModel::Direction pdir = (is_output) @@ -314,8 +317,7 @@ ClientStore::put(const Raul::URI& uri, p->set_properties(properties); add_object(p); } else { - _log.warn(fmt("Ignoring object %1% with unknown type\n") - % path.c_str()); + _log.warn(fmt("Ignoring %1% of unknown type\n") % path.c_str()); } } |