From e1ea99192e10149e0cac7a93f98fbec20e7cedb2 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 3 Apr 2015 17:10:58 +0000 Subject: Use lv2:prototype and deprecate ingen:prototype. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5652 a436a847-0d15-0410-975c-d299462d15a1 --- src/client/ClientStore.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/client/ClientStore.cpp') 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 plug; if (p->second.is_valid() && p->second.type() == _uris.forge.URI) { if (!(plug = _plugin(Raul::URI(p->second.ptr())))) { @@ -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()); } } -- cgit v1.2.1