hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #2433 from LMMS/ladspa-dirs

Browse Source 
Fix ladspa plugin discovery
This commit is contained in:
Lukas W
2015-11-04 09:14:04 +01:00
parent 6d888fd61b 8b65ae37b4
commit 2284a8c353
8 changed files with 12 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/ConfigManager.cpp
View File

@@ -77,17 +77,10 @@ ConfigManager::ConfigManager() :
QString line = stream.readLine();
if (line.startsWith("lmms_SOURCE_DIR:")) {
// Current source directory contains respective data directory
QString srcDir = line.section('=', -1).trimmed();
QDir::addSearchPath("data", srcDir + "/data/");
break;
}
if (line.startsWith("lmms_BINARY_DIR:")) {
// Current build directory contains respective LADSPA plugins
QString binDir = line.section('=', -1).trimmed();
m_ladDir = binDir + "/plugins/ladspa/";
m_ladDir += "," + userLadspaDir();
}
}
cmakeCache.close();
@@ -455,15 +448,7 @@ void ConfigManager::loadConfigFile()
if( m_ladDir.isEmpty() )
{
#if defined(LMMS_BUILD_WIN32)
m_ladDir = qApp->applicationDirPath() + "/plugins/ladspa" + QDir::separator();
#elif defined(LMMS_BUILD_APPLE)
m_ladDir = qApp->applicationDirPath() + "/../lib/lmms/ladspa/";
#else
m_ladDir = qApp->applicationDirPath() + '/' + LIB_DIR + "/lmms/ladspa/";
#endif
m_ladDir = QDir::cleanPath( m_ladDir );
m_ladDir += ","+userLadspaDir();
m_ladDir = userLadspaDir();
}
#ifdef LMMS_HAVE_STK

4
src/core/LadspaManager.cpp
View File

@@ -34,11 +34,15 @@
#include "ConfigManager.h"
#include "LadspaManager.h"
#include "PluginFactory.h"
LadspaManager::LadspaManager()
{
// Make sure plugin search paths are set up
PluginFactory::instance();
QStringList ladspaDirectories = QString( getenv( "LADSPA_PATH" ) ).
split( LADSPA_PATH_SEPERATOR );
ladspaDirectories += ConfigManager::inst()->ladspaDir().split( ',' );