From 75dbb2ea2b29549bc5989a160736dd209157e19c Mon Sep 17 00:00:00 2001
From: RJ Ryan <rryan@mixxx.org>
Date: Tue, 22 Dec 2015 16:27:51 -0500
Subject: Pass search paths into PresetInfoEnumerator.

---
 src/controllers/controllermanager.cpp              | 5 ++++-
 src/controllers/controllerpresetinfoenumerator.cpp | 8 +++-----
 src/controllers/controllerpresetinfoenumerator.h   | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 051c273726..d6665723da 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -72,7 +72,10 @@ ControllerManager::ControllerManager(ConfigObject<ConfigValue>* pConfig)
 
     // Initialize preset info parsers. This object is only for use in the main
     // thread. Do not touch it from within ControllerManager.
-    m_pMainThreadPresetEnumerator = new PresetInfoEnumerator(m_pConfig);
+    QStringList presetSearchPaths;
+    presetSearchPaths << userPresetsPath(m_pConfig)
+                      << resourcePresetsPath(m_pConfig);
+    m_pMainThreadPresetEnumerator = new PresetInfoEnumerator(presetSearchPaths);
 
     // Instantiate all enumerators
     m_enumerators.append(new PortMidiEnumerator());
diff --git a/src/controllers/controllerpresetinfoenumerator.cpp b/src/controllers/controllerpresetinfoenumerator.cpp
index a8862ef770..6c4e99a73c 100644
--- a/src/controllers/controllerpresetinfoenumerator.cpp
+++ b/src/controllers/controllerpresetinfoenumerator.cpp
@@ -11,10 +11,8 @@
 
 #include "controllers/defs_controllers.h"
 
-PresetInfoEnumerator::PresetInfoEnumerator(ConfigObject<ConfigValue>* pConfig) {
-    m_controllerDirPaths.append(userPresetsPath(pConfig));
-    m_controllerDirPaths.append(resourcePresetsPath(pConfig));
-
+PresetInfoEnumerator::PresetInfoEnumerator(const QStringList& searchPaths)
+        : m_controllerDirPaths(searchPaths) {
     // Static list of supported default extensions, sorted by popularity
     m_fileExtensions.append(QString(MIDI_PRESET_EXTENSION));
     m_fileExtensions.append(QString(HID_PRESET_EXTENSION));
@@ -136,4 +134,4 @@ void PresetInfoEnumerator::updatePresets(const QString extension) {
     }
 
     m_presetsByExtension[extension] = presets;
-}
\ No newline at end of file
+}
diff --git a/src/controllers/controllerpresetinfoenumerator.h b/src/controllers/controllerpresetinfoenumerator.h
index ccbea843cf..6c901c38a6 100644
--- a/src/controllers/controllerpresetinfoenumerator.h
+++ b/src/controllers/controllerpresetinfoenumerator.h
@@ -15,7 +15,7 @@
 
 class PresetInfoEnumerator {
   public:
-    PresetInfoEnumerator(ConfigObject<ConfigValue> *pConfig);
+    PresetInfoEnumerator(const QStringList& searchPaths);
     virtual ~PresetInfoEnumerator();
 
     bool isValidExtension(const QString extension);
@@ -47,4 +47,4 @@ class PresetInfoEnumerator {
     QMap<QString, ControllerPresetFileHandler*> m_presetFileHandlersByExtension;
 };
 
-#endif
\ No newline at end of file
+#endif
-- 
cgit v1.2.3