From 45cafd3f601b08c7cf675394f78351d65d342b4c Mon Sep 17 00:00:00 2001
From: Lukas W <lukaswhl@gmail.com>
Date: Fri, 30 Oct 2015 22:53:28 +0100
Subject: [PATCH] Fix ladspa plugin discovery

---
 plugins/LadspaEffect/CMakeLists.txt | 11 ++++-------
 src/core/ConfigManager.cpp          | 11 ++---------
 src/core/LadspaManager.cpp          |  5 ++++-
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/plugins/LadspaEffect/CMakeLists.txt b/plugins/LadspaEffect/CMakeLists.txt
index 37a32ff24..07d4cb0aa 100644
--- a/plugins/LadspaEffect/CMakeLists.txt
+++ b/plugins/LadspaEffect/CMakeLists.txt
@@ -1,3 +1,7 @@
+INCLUDE(BuildPlugin)
+
+BUILD_PLUGIN(ladspaeffect LadspaEffect.cpp LadspaControls.cpp LadspaControlDialog.cpp LadspaSubPluginFeatures.cpp LadspaEffect.h LadspaControls.h LadspaControlDialog.h LadspaSubPluginFeatures.h MOCFILES LadspaEffect.h LadspaControls.h LadspaControlDialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+
 SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ladspa")
 
 IF(WANT_CAPS)
@@ -19,10 +23,3 @@ ENDIF(WANT_CMT)
 IF(WANT_CALF)
 ADD_SUBDIRECTORY(calf)
 ENDIF(WANT_CALF)
-
-
-INCLUDE(BuildPlugin)
-
-BUILD_PLUGIN(ladspaeffect LadspaEffect.cpp LadspaControls.cpp LadspaControlDialog.cpp LadspaSubPluginFeatures.cpp LadspaEffect.h LadspaControls.h LadspaControlDialog.h LadspaSubPluginFeatures.h MOCFILES LadspaEffect.h LadspaControls.h LadspaControlDialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
-
-
diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp
index 692489bf3..374659102 100644
--- a/src/core/ConfigManager.cpp
+++ b/src/core/ConfigManager.cpp
@@ -448,15 +448,8 @@ 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 = "plugins:ladspa/";
+		m_ladDir = ","+userLadspaDir();
 	}
 
 #ifdef LMMS_HAVE_STK
diff --git a/src/core/LadspaManager.cpp b/src/core/LadspaManager.cpp
index a397efc86..f21c00e47 100644
--- a/src/core/LadspaManager.cpp
+++ b/src/core/LadspaManager.cpp
@@ -34,16 +34,19 @@
 
 #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( ',' );
 
-	ladspaDirectories.push_back( "plugins:ladspa" );
 #ifndef LMMS_BUILD_WIN32
 	ladspaDirectories.push_back( qApp->applicationDirPath() + '/' + LIB_DIR + "ladspa" );
 	ladspaDirectories.push_back( "/usr/lib/ladspa" );