From 5a13d82475a5b71b66462a62fae6ae2585622de6 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 6 Apr 2013 10:58:34 +0100 Subject: [PATCH] Fix Mac and Haiku plugin paths --- source/carla_shared.py | 20 ++++++++++++++------ source/libs/lilv/config/lilv_config.h | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/source/carla_shared.py b/source/carla_shared.py index 1b98e4e99..df42bc007 100644 --- a/source/carla_shared.py +++ b/source/carla_shared.py @@ -307,11 +307,20 @@ if WINDOWS: elif HAIKU: splitter = ":" + DEFAULT_LADSPA_PATH = ":".join((os.path.join(HOME, ".ladspa"), + os.path.join("/", "usr", "lib", "ladspa"), + os.path.join("/", "usr", "local", "lib", "ladspa"))) + + DEFAULT_DSSI_PATH = ":".join((os.path.join(HOME, ".dssi"), + os.path.join("/", "boot", "common", "add-ons", "dssi"))) + + DEFAULT_LV2_PATH = ":".join((os.path.join(HOME, ".lv2"), + os.path.join("/", "boot", "common", "add-ons", "lv2"))) + + DEFAULT_VST_PATH = ":".join((os.path.join(HOME, ".vst"), + os.path.join("/", "boot", "common", "add-ons", "vst"))) + # TODO - DEFAULT_LADSPA_PATH = "" - DEFAULT_DSSI_PATH = "" - DEFAULT_LV2_PATH = "" - DEFAULT_VST_PATH = "" DEFAULT_GIG_PATH = "" DEFAULT_SF2_PATH = "" DEFAULT_SFZ_PATH = "" @@ -359,8 +368,7 @@ else: os.path.join("/", "usr", "share", "sounds", "gig"))) DEFAULT_SF2_PATH = ":".join((os.path.join(HOME, ".sounds"), - os.path.join("/", "usr", "share", "sounds", "sf2"), - "/home/falktx/Personal/Muzyks/Kits/SF2/")) + os.path.join("/", "usr", "share", "sounds", "sf2"))) DEFAULT_SFZ_PATH = ":".join((os.path.join(HOME, ".sounds"), os.path.join("/", "usr", "share", "sounds", "sfz"))) diff --git a/source/libs/lilv/config/lilv_config.h b/source/libs/lilv/config/lilv_config.h index d1a072db4..1d6fc5391 100644 --- a/source/libs/lilv/config/lilv_config.h +++ b/source/libs/lilv/config/lilv_config.h @@ -23,7 +23,7 @@ #endif #if defined(__APPLE__) - #define LILV_DEFAULT_LV2_PATH "~/.lv2:/usr/local/lib/lv2:/usr/lib/lv2:/Library/Audio/Plug-Ins/LV2" + #define LILV_DEFAULT_LV2_PATH "~/Library/Audio/Plug-Ins/LV2:/Library/Audio/Plug-Ins/LV2" #elif defined(__HAIKU__) #define LILV_DEFAULT_LV2_PATH "~/.lv2:/boot/common/add-ons/lv2" #elif defined(__WIN32__)