From 9516b7cf0ef7a8d6449c675e92b09a0bc6c82fee Mon Sep 17 00:00:00 2001
From: Dave French <dave.french3@googlemail.com>
Date: Fri, 27 Mar 2015 15:19:57 +0000
Subject: [PATCH] Added user Vst and ladspa folders

the user vst folder nowbecome the default vstfolder. this is configurable
in the setup dialog.

The user ladspa folder is added to the list of folder to search
---
 include/ConfigManager.h    | 15 +++++++++++++--
 src/core/ConfigManager.cpp |  8 ++++++--
 src/gui/SetupDialog.cpp    | 12 ++++++------
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/include/ConfigManager.h b/include/ConfigManager.h
index 026a64d02..f6ecbc577 100644
--- a/include/ConfigManager.h
+++ b/include/ConfigManager.h
@@ -43,8 +43,9 @@ class Engine;
 const QString PROJECTS_PATH = "projects/";
 const QString PRESETS_PATH = "presets/";
 const QString SAMPLES_PATH = "samples/";
-const QString GIG_PATH = "samples/gig";
-const QString SF2_PATH = "samples/sf2";
+const QString GIG_PATH = "samples/gig/";
+const QString SF2_PATH = "samples/sf2/";
+const QString LADSPA_PATH ="plugins/ladspa/";
 const QString DEFAULT_THEME_PATH = "themes/default/";
 const QString TRACK_ICON_PATH = "track_icons/";
 const QString LOCALE_PATH = "locale/";
@@ -93,6 +94,16 @@ public:
 		return workingDir() + GIG_PATH;
 	}
 
+	QString userSf2Dir() const
+	{
+		return workingDir() + SF2_PATH;
+	}
+
+	QString userLadspaDir() const
+	{
+		return workingDir() + LADSPA_PATH;
+	}
+
 	QString factoryProjectsDir() const
 	{
 		return dataDir() + PROJECTS_PATH;
diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp
index a7328e5ee..cf485f4ab 100644
--- a/src/core/ConfigManager.cpp
+++ b/src/core/ConfigManager.cpp
@@ -384,7 +384,7 @@ void ConfigManager::loadConfigFile()
 		m_vstDir = windowsConfigPath( CSIDL_PROGRAM_FILES ) +
 											QDir::separator() + "VstPlugins";
 #else
-		m_vstDir = ensureTrailingSlash( QDir::home().absolutePath() );
+		m_vstDir =  m_workingDir + "plugins/vst" + QDir::separator();
 #endif
 	}
 
@@ -403,6 +403,7 @@ void ConfigManager::loadConfigFile()
 #else
 		m_ladDir = qApp->applicationDirPath() + '/' + LIB_DIR + "/ladspa/";
 #endif
+		m_ladDir += ","+userLadspaDir();
 	}
 
 #ifdef LMMS_HAVE_STK
@@ -441,7 +442,10 @@ void ConfigManager::loadConfigFile()
 		QDir().mkpath( userSamplesDir() );
 		QDir().mkpath( userPresetsDir() );
 		QDir().mkpath( userGigDir() );
-		QDir().mkpath( sf2Dir() );
+		QDir().mkpath( userSf2Dir() );
+		QDir().mkpath( vstDir() );
+		QDir().mkpath( userLadspaDir() );
+
 	}
 
 	upgrade();
diff --git a/src/gui/SetupDialog.cpp b/src/gui/SetupDialog.cpp
index 9cbd1a6fa..7ca9911ce 100644
--- a/src/gui/SetupDialog.cpp
+++ b/src/gui/SetupDialog.cpp
@@ -612,12 +612,6 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
 	pathSelectorLayout->addSpacing( 10 );
 	pathSelectorLayout->addWidget( sf2_tw );
 	pathSelectorLayout->addSpacing( 10 );
-	pathSelectorLayout->addWidget( artwork_tw );
-	pathSelectorLayout->addSpacing( 10 );
-	pathSelectorLayout->addWidget( backgroundArtwork_tw );
-	pathSelectorLayout->addSpacing( 10 );
-	pathSelectorLayout->addWidget( fl_tw );
-	pathSelectorLayout->addSpacing( 10 );
 	pathSelectorLayout->addWidget( vst_tw );
 	pathSelectorLayout->addSpacing( 10 );
 	pathSelectorLayout->addWidget( lad_tw );
@@ -629,7 +623,13 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
 	pathSelectorLayout->addSpacing( 10 );
 	pathSelectorLayout->addWidget( sf_tw );
 #endif	
+	pathSelectorLayout->addWidget( fl_tw );
+	pathSelectorLayout->addSpacing( 10 );
+	pathSelectorLayout->addWidget( artwork_tw );
+	pathSelectorLayout->addSpacing( 10 );
 	pathSelectorLayout->addStretch();
+	pathSelectorLayout->addWidget( backgroundArtwork_tw );
+	pathSelectorLayout->addSpacing( 10 );
 
 	dir_layout->addWidget( pathSelectors );