From c11a7a1bd7ae2d8ec0862eaa61022567dfb8a673 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 29 Jan 2015 02:12:15 +0100 Subject: [PATCH] allow bundling of lv2core MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc index 9890ab2356..5a97bfa41f 100644 --- a/libs/ardour/lv2_plugin.cc +++ b/libs/ardour/lv2_plugin.cc @@ -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; } }