From 3b22d3c8c57867cad7304dac1e9be5ee36ae9715 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 28 Aug 2015 03:07:12 +0000 Subject: Get rid of LV2Info class. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5708 a436a847-0d15-0410-975c-d299462d15a1 --- src/server/BlockFactory.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'src/server/BlockFactory.cpp') diff --git a/src/server/BlockFactory.cpp b/src/server/BlockFactory.cpp index 5b00bb76..0a51e03e 100644 --- a/src/server/BlockFactory.cpp +++ b/src/server/BlockFactory.cpp @@ -27,9 +27,9 @@ #include "internals/Time.hpp" #include "internals/Trigger.hpp" +#include "BlockFactory.hpp" #include "InternalPlugin.hpp" #include "LV2Plugin.hpp" -#include "BlockFactory.hpp" #include "ThreadManager.hpp" using namespace std; @@ -41,7 +41,6 @@ using namespace Internals; BlockFactory::BlockFactory(Ingen::World* world) : _world(world) - , _lv2_info(new LV2Info(world)) , _has_loaded(false) { load_internal_plugins(); @@ -107,8 +106,7 @@ BlockFactory::load_plugin(const Raul::URI& uri) 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(_lv2_info, uri); - ingen_plugin->lilv_plugin(plug); + LV2Plugin* const ingen_plugin = new LV2Plugin(_world, plug); _plugins.insert(make_pair(uri, ingen_plugin)); } lilv_node_free(node); @@ -129,9 +127,6 @@ BlockFactory::load_lv2_plugins() lilv_node_free)); } - LilvNode* lv2_connectionOptional = lilv_new_uri( - _world->lilv_world(), LV2_CORE__connectionOptional); - 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); @@ -173,7 +168,9 @@ BlockFactory::load_lv2_plugins() } } if (!supported && - !lilv_port_has_property(lv2_plug, port, lv2_connectionOptional)) { + !lilv_port_has_property(lv2_plug, + port, + _world->uris().lv2_connectionOptional)) { _world->log().warn( fmt("Ignoring <%1%>; unsupported port <%2%>\n") % uri % lilv_node_as_string( @@ -186,15 +183,12 @@ BlockFactory::load_lv2_plugins() } if (_plugins.find(uri) == _plugins.end()) { - LV2Plugin* const plugin = new LV2Plugin(_lv2_info, uri); - plugin->lilv_plugin(lv2_plug); + LV2Plugin* const plugin = new LV2Plugin(_world, lv2_plug); _plugins.insert(make_pair(uri, plugin)); } } _world->log().info(fmt("Loaded %1% plugins\n") % _plugins.size()); - - lilv_node_free(lv2_connectionOptional); } } // namespace Server -- cgit v1.2.1