diff options
Diffstat (limited to 'src/server/BlockFactory.cpp')
-rw-r--r-- | src/server/BlockFactory.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/server/BlockFactory.cpp b/src/server/BlockFactory.cpp index de983df6..105d60cf 100644 --- a/src/server/BlockFactory.cpp +++ b/src/server/BlockFactory.cpp @@ -37,7 +37,7 @@ namespace server { using namespace internals; -BlockFactory::BlockFactory(ingen::World* world) +BlockFactory::BlockFactory(ingen::World& world) : _world(world) , _has_loaded(false) { @@ -109,7 +109,7 @@ BlockFactory::plugin(const URI& uri) void BlockFactory::load_internal_plugins() { - ingen::URIs& uris = _world->uris(); + ingen::URIs& uris = _world.uris(); InternalPlugin* block_delay_plug = BlockDelayNode::internal_plugin(uris); _plugins.emplace(block_delay_plug->uri(), block_delay_plug); @@ -133,8 +133,8 @@ BlockFactory::load_plugin(const URI& uri) return; } - LilvNode* node = lilv_new_uri(_world->lilv_world(), uri.c_str()); - const LilvPlugins* plugs = lilv_world_get_all_plugins(_world->lilv_world()); + LilvNode* node = lilv_new_uri(_world.lilv_world(), uri.c_str()); + const LilvPlugins* plugs = lilv_world_get_all_plugins(_world.lilv_world()); const LilvPlugin* plug = lilv_plugins_get_by_uri(plugs, node); if (plug) { LV2Plugin* const ingen_plugin = new LV2Plugin(_world, plug); @@ -154,11 +154,11 @@ BlockFactory::load_lv2_plugins() for (unsigned t = PortType::ID::AUDIO; t <= PortType::ID::ATOM; ++t) { const URI& uri(PortType((PortType::ID)t).uri()); types.push_back( - SPtr<LilvNode>(lilv_new_uri(_world->lilv_world(), uri.c_str()), + SPtr<LilvNode>(lilv_new_uri(_world.lilv_world(), uri.c_str()), lilv_node_free)); } - const LilvPlugins* plugins = lilv_world_get_all_plugins(_world->lilv_world()); + const LilvPlugins* plugins = lilv_world_get_all_plugins(_world.lilv_world()); LILV_FOREACH(plugins, i, plugins) { const LilvPlugin* lv2_plug = lilv_plugins_get(plugins, i); const URI uri(lilv_node_as_uri(lilv_plugin_get_uri(lv2_plug))); @@ -168,9 +168,9 @@ BlockFactory::load_lv2_plugins() bool supported = true; LILV_FOREACH(nodes, f, features) { const char* feature = lilv_node_as_uri(lilv_nodes_get(features, f)); - if (!_world->lv2_features().is_supported(feature)) { + if (!_world.lv2_features().is_supported(feature)) { supported = false; - _world->log().warn( + _world.log().warn( fmt("Ignoring <%1%>; required feature <%2%>\n") % uri % feature); break; @@ -183,7 +183,7 @@ BlockFactory::load_lv2_plugins() // Ignore plugins that are missing ports if (!lilv_plugin_get_port_by_index(lv2_plug, 0)) { - _world->log().warn( + _world.log().warn( fmt("Ignoring <%1%>; missing or corrupt ports\n") % uri); continue; } @@ -201,8 +201,8 @@ BlockFactory::load_lv2_plugins() if (!supported && !lilv_port_has_property(lv2_plug, port, - _world->uris().lv2_connectionOptional)) { - _world->log().warn( + _world.uris().lv2_connectionOptional)) { + _world.log().warn( fmt("Ignoring <%1%>; unsupported port <%2%>\n") % uri % lilv_node_as_string( lilv_port_get_symbol(lv2_plug, port))); @@ -222,7 +222,7 @@ BlockFactory::load_lv2_plugins() } } - _world->log().info(fmt("Loaded %1% plugins\n") % _plugins.size()); + _world.log().info(fmt("Loaded %1% plugins\n") % _plugins.size()); } } // namespace server |