diff options
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/ClientStore.cpp | 1 | ||||
| -rw-r--r-- | src/client/PluginModel.cpp | 13 | ||||
| -rw-r--r-- | src/client/PluginUI.cpp | 6 | ||||
| -rw-r--r-- | src/client/wscript | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index a42efd16..2fdfa4a7 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -59,6 +59,7 @@ ClientStore::clear() void ClientStore::add_object(SPtr<ObjectModel> object) { + _log.info("Add object %1%\n", object->path()); // If we already have "this" object, merge the existing one into the new // one (with precedence to the new values). auto existing = find(object->path()); diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp index f0e3c3a0..b0a2c5cb 100644 --- a/src/client/PluginModel.cpp +++ b/src/client/PluginModel.cpp @@ -38,8 +38,6 @@ namespace client { LilvWorld* PluginModel::_lilv_world = nullptr; const LilvPlugins* PluginModel::_lilv_plugins = nullptr; -Sord::World* PluginModel::_rdf_world = nullptr; - PluginModel::PluginModel(URIs& uris, const URI& uri, const Atom& type, @@ -65,7 +63,7 @@ PluginModel::PluginModel(URIs& uris, if (uris.ingen_Internal == _type) { set_property(uris.doap_name, - uris.forge.alloc(std::string(uri.fragment().substr(1)))); + uris.forge.alloc(uri.fragment().substr(1))); } } @@ -103,7 +101,7 @@ PluginModel::get_property(const URI& key) const // No lv2:symbol from data or engine, invent one if (key == _uris.lv2_symbol) { - string str = this->uri(); + string str = this->uri().str(); size_t last_delim = last_uri_delim(str); while (last_delim != string::npos && !contains_alpha_after(str, last_delim)) { @@ -264,12 +262,13 @@ heading(const std::string& text, bool html, unsigned level) } static std::string -link(const std::string& addr, bool html) +link(const URI& addr, bool html) { if (html) { - return std::string("<a href=\"") + addr + "\">" + addr + "</a>"; + return std::string("<a href=\"") + addr.str() + "\">" + addr.str() + + "</a>"; } else { - return addr; + return addr.str(); } } diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp index a997d716..72a1fba0 100644 --- a/src/client/PluginUI.cpp +++ b/src/client/PluginUI.cpp @@ -224,9 +224,9 @@ PluginUI::create(ingen::World& world, bool PluginUI::instantiate() { - const URIs& uris = _world.uris(); - const std::string plugin_uri = _block->plugin()->uri(); - LilvWorld* lworld = _world.lilv_world(); + const URIs& uris = _world.uris(); + const URI& plugin_uri = _block->plugin()->uri(); + LilvWorld* lworld = _world.lilv_world(); // Load seeAlso files to access data like portNotification descriptions lilv_world_load_resource(lworld, lilv_ui_get_uri(_ui)); diff --git a/src/client/wscript b/src/client/wscript index 394c9e4d..c42046e1 100644 --- a/src/client/wscript +++ b/src/client/wscript @@ -10,7 +10,7 @@ def build(bld): target = 'ingen_client', install_path = '${LIBDIR}', use = 'libingen', - uselib = 'GLIBMM LV2 LILV SUIL RAUL SERD SORD SIGCPP') + uselib = 'GLIBMM LV2 LILV SUIL RAUL SERD SIGCPP') obj.source = ''' BlockModel.cpp |