Browse Source

Fix Mac and Haiku plugin paths

tags/1.9.4
falkTX 11 years ago
parent
commit
5a13d82475
2 changed files with 15 additions and 7 deletions
  1. +14
    -6
      source/carla_shared.py
  2. +1
    -1
      source/libs/lilv/config/lilv_config.h

+ 14
- 6
source/carla_shared.py View File

@@ -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")))


+ 1
- 1
source/libs/lilv/config/lilv_config.h View File

@@ -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__)


Loading…
Cancel
Save