diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2014-06-16 20:39:45 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2014-06-17 21:13:05 +1000 |
| commit | 0e96d84079c1792523d99b6bbec5878d11f5c8e4 (patch) | |
| tree | b4faae743beff6136031953c12b3858d6b44cea8 /libs/ardour/lv2_plugin.cc | |
| parent | e426c603b679903502989b2b36966e3fb2facd23 (diff) | |
Change PBD::PathScanner API to return results by value to avoid inadvertent memory leaks
Diffstat (limited to 'libs/ardour/lv2_plugin.cc')
| -rw-r--r-- | libs/ardour/lv2_plugin.cc | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc index 8fac9369b0..d68c4e5077 100644 --- a/libs/ardour/lv2_plugin.cc +++ b/libs/ardour/lv2_plugin.cc @@ -2013,23 +2013,20 @@ void LV2World::load_bundled_plugins() { if (!_bundle_checked) { - cout << "Scanning folders for bundled LV2s: " << ARDOUR::lv2_bundled_search_path().to_string() << endl; PathScanner scanner; - vector<string *> *plugin_objects = scanner (ARDOUR::lv2_bundled_search_path().to_string(), lv2_filter, 0, true, true); - if (plugin_objects) { - for ( vector<string *>::iterator x = plugin_objects->begin(); x != plugin_objects->end (); ++x) { + cout << "Scanning folders for bundled LV2s: " << ARDOUR::lv2_bundled_search_path().to_string() << endl; + + vector<string> plugin_objects = scanner (ARDOUR::lv2_bundled_search_path().to_string(), lv2_filter, 0, true, true); + for ( vector<string>::iterator x = plugin_objects.begin(); x != plugin_objects.end (); ++x) { #ifdef PLATFORM_WINDOWS - string uri = "file:///" + **x + "/"; + string uri = "file:///" + *x + "/"; #else - string uri = "file://" + **x + "/"; + string uri = "file://" + *x + "/"; #endif - LilvNode *node = lilv_new_uri(world, uri.c_str()); - lilv_world_load_bundle(world, node); - lilv_node_free(node); - } + LilvNode *node = lilv_new_uri(world, uri.c_str()); + lilv_world_load_bundle(world, node); + lilv_node_free(node); } - vector_delete (plugin_objects); - delete (plugin_objects); _bundle_checked = true; } |