From 4e9ebd09c69deb22d4c76179259bb74de799fae2 Mon Sep 17 00:00:00 2001 From: Paul Giblock Date: Wed, 11 Aug 2010 21:40:54 -0400 Subject: [PATCH] Use proper path seperator for LADSPA_PATH According to http://www.ladspa.org/ladspa_sdk/shared_plugins.html, LADSPA_PATH is supposed to be delimited by colons. This patch does so, except on Windows. On Windows we use ';' instead of ':' since colon is a legal character for a path. --- include/lmms_basics.h | 7 +++++++ src/core/ladspa_manager.cpp | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/lmms_basics.h b/include/lmms_basics.h index 716951b3c..a71a08ea7 100644 --- a/include/lmms_basics.h +++ b/include/lmms_basics.h @@ -119,6 +119,13 @@ inline bool typeInfo::isEqual( float _x, float _y ) #endif +#ifdef LMMS_BUILD_WIN32 +#define PATH_SEPERATOR = ';'; +#else +#define PATH_SEPERATOR = ':'; +#endif + + #define DEFAULT_CHANNELS 2 #define LMMS_DISABLE_SURROUND #ifdef LMMS_DISABLE_SURROUND diff --git a/src/core/ladspa_manager.cpp b/src/core/ladspa_manager.cpp index 80d184ceb..a7be25eb0 100644 --- a/src/core/ladspa_manager.cpp +++ b/src/core/ladspa_manager.cpp @@ -38,7 +38,7 @@ ladspaManager::ladspaManager() { QStringList ladspaDirectories = QString( getenv( "LADSPA_PATH" ) ). - split( ',' ); + split( PATH_SEPERATOR ); ladspaDirectories += configManager::inst()->ladspaDir().split( ',' ); ladspaDirectories.push_back( configManager::inst()->pluginDir() + "ladspa" );