Browse Source

Patch lilv to pass lv2_path directly; Cleaner and works with wine

tags/1.9.5
falkTX 11 years ago
parent
commit
0e0e7e2c1f
4 changed files with 4 additions and 14 deletions
  1. +1
    -1
      source/modules/lilv/lilv-0.20.0/lilv/lilv.h
  2. +1
    -1
      source/modules/lilv/lilv-0.20.0/lilv/lilvmm.hpp
  3. +1
    -5
      source/modules/lilv/lilv-0.20.0/src/world.c
  4. +1
    -7
      source/utils/CarlaLv2Utils.hpp

+ 1
- 1
source/modules/lilv/lilv-0.20.0/lilv/lilv.h View File

@@ -527,7 +527,7 @@ lilv_world_free(LilvWorld* world);
with special plugin bundles which are installed to a known location).
*/
LILV_API void
lilv_world_load_all(LilvWorld* world);
lilv_world_load_all(LilvWorld* world, const char* lv2_path);

/**
Load a specific bundle.


+ 1
- 1
source/modules/lilv/lilv-0.20.0/lilv/lilvmm.hpp View File

@@ -344,7 +344,7 @@ struct World {
}

LILV_WRAP2_VOID(world, set_option, const char*, uri, LilvNode*, value);
LILV_WRAP0_VOID(world, load_all);
LILV_WRAP1_VOID(world, load_all, const char*, lv2_path);
LILV_WRAP1_VOID(world, load_bundle, LilvNode*, bundle_uri);
LILV_WRAP0(const LilvPluginClass*, world, get_plugin_class);
LILV_WRAP0(const LilvPluginClasses*, world, get_plugin_classes);


+ 1
- 5
source/modules/lilv/lilv-0.20.0/src/world.c View File

@@ -782,12 +782,8 @@ lilv_world_load_plugin_classes(LilvWorld* world)
}

LILV_API void
lilv_world_load_all(LilvWorld* world)
lilv_world_load_all(LilvWorld* world, const char* lv2_path)
{
const char* lv2_path = getenv("LV2_PATH");
if (!lv2_path)
lv2_path = LILV_DEFAULT_LV2_PATH;

// Discover bundles and read all manifest files into model
lilv_world_load_path(world, lv2_path);



+ 1
- 7
source/utils/CarlaLv2Utils.hpp View File

@@ -376,13 +376,7 @@ public:

needsInit = false;

char* const oldLv2Path(std::getenv("LV2_PATH"));
carla_setenv("LV2_PATH", LV2_PATH);

Lilv::World::load_all();

if (oldLv2Path != nullptr)
carla_setenv("LV2_PATH", oldLv2Path);
Lilv::World::load_all(LV2_PATH);
}

void load_bundle(const char* const bundle)


Loading…
Cancel
Save