allow bundling of lv2core
authorRobin Gareus <robin@gareus.org>
Thu, 29 Jan 2015 01:12:15 +0000 (02:12 +0100)
committerRobin Gareus <robin@gareus.org>
Thu, 29 Jan 2015 01:13:33 +0000 (02:13 +0100)
Don’t statically initiate the lv2 world, use explicit call after
scanning bundles.

lilv_world_load_specifications() and lilv_world_load_plugin_classes()
are only ever called after lilv_world_load_all(), so we postpone
the call to it.

libs/ardour/lv2_plugin.cc

index 9890ab235601b392b08b2600cabdf087a7a7add8..5a97bfa41f6b26713e06dea858b7ed979a4c933b 100644 (file)
@@ -2287,8 +2287,6 @@ LV2World::LV2World()
        : world(lilv_world_new())
        , _bundle_checked(false)
 {
-       lilv_world_load_all(world);
-
        atom_AtomPort      = lilv_new_uri(world, LV2_ATOM__AtomPort);
        atom_Chunk         = lilv_new_uri(world, LV2_ATOM__Chunk);
        atom_Sequence      = lilv_new_uri(world, LV2_ATOM__Sequence);
@@ -2392,6 +2390,7 @@ LV2World::load_bundled_plugins(bool verbose)
                        lilv_node_free(node);
                }
 
+               lilv_world_load_all(world);
                _bundle_checked = true;
        }
 }