diff options
| author | David Robillard <d@drobilla.net> | 2008-01-25 06:55:57 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-01-25 06:55:57 +0000 |
| commit | df8ee18c0139f889bf7c697713a2205364845464 (patch) | |
| tree | 2d3d2389504676b194fcb47a9ed3e7b1da8f94c4 /src/libs/engine/NodeFactory.cpp | |
| parent | f3f08e248a96f2a6d75d4fc6ee3dc34985805e58 (diff) | |
| download | ingen-df8ee18c0139f889bf7c697713a2205364845464.tar.gz ingen-df8ee18c0139f889bf7c697713a2205364845464.tar.bz2 ingen-df8ee18c0139f889bf7c697713a2205364845464.zip | |
Overhaul SLV2 API to return/take SLV2Value (instead of strings or primitives) wherever possible.
Make 'index' a fundemental property of ingen ports.
git-svn-id: http://svn.drobilla.net/lad/ingen@1113 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/engine/NodeFactory.cpp')
| -rw-r--r-- | src/libs/engine/NodeFactory.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/libs/engine/NodeFactory.cpp b/src/libs/engine/NodeFactory.cpp index eb414978..4ca038b6 100644 --- a/src/libs/engine/NodeFactory.cpp +++ b/src/libs/engine/NodeFactory.cpp @@ -179,7 +179,7 @@ NodeFactory::load_lv2_plugins() SLV2Plugin lv2_plug = slv2_plugins_get_at(plugins, i); - const string uri((const char*)slv2_plugin_get_uri(lv2_plug)); + const string uri(slv2_value_as_uri(slv2_plugin_get_uri(lv2_plug))); #ifndef NDEBUG assert(_plugins.find(uri) == _plugins.end()); @@ -188,16 +188,9 @@ NodeFactory::load_lv2_plugins() LV2Plugin* const plugin = new LV2Plugin(_lv2_info, uri); plugin->slv2_plugin(lv2_plug); - plugin->library_path(slv2_uri_to_path(slv2_plugin_get_library_uri(lv2_plug))); - char* const name = slv2_plugin_get_name(lv2_plug); - if (name) { - //plugin->name(name); - free(name); - _plugins.insert(make_pair(uri, plugin)); - } else { - cerr << "ERROR: LV2 Plugin " << uri << " has no name. Ignoring." << endl; - continue; - } + plugin->library_path(slv2_uri_to_path(slv2_value_as_uri( + slv2_plugin_get_library_uri(lv2_plug)))); + _plugins.insert(make_pair(uri, plugin)); } slv2_plugins_free(_world->slv2_world, plugins); |