Use helper methods / defines in ControllerPresetInfo instead of duplicating code.

1 files changed, 6 insertions, 12 deletions

diff --git a/src/controllers/controllerpresetinfo.cpp b/src/controllers/controllerpresetinfo.cpp
index 8439fe5893..ff4d8f3035 100644
--- a/src/controllers/controllerpresetinfo.cpp
+++ b/src/controllers/controllerpresetinfo.cpp
@@ -134,20 +134,15 @@ QHash<QString,QString> PresetInfo::parseOSCProduct(const QDomElement& element) c
     return product;
 }
 
-PresetInfoEnumerator::PresetInfoEnumerator(ConfigObject<ConfigValue> *pConfig)
+PresetInfoEnumerator::PresetInfoEnumerator(ConfigObject<ConfigValue>* pConfig)
         : m_pConfig(pConfig) {
-
-    QString configPath = m_pConfig->getResourcePath();
-    controllerDirPaths.append(configPath.append("controllers/"));
-    QString settingsPath = m_pConfig->getSettingsPath();
-    controllerDirPaths.append(settingsPath.append("presets/"));
+    controllerDirPaths.append(localPresetsPath(pConfig));
+    controllerDirPaths.append(resourcePresetsPath(pConfig));
 
     // Static list of supported default extensions, sorted by popularity
-    fileExtensions.append(QString(".midi.xml"));
-    fileExtensions.append(QString(".cntrlr.xml"));
-    fileExtensions.append(QString(".hid.xml"));
-    fileExtensions.append(QString(".bulk.xml"));
-    fileExtensions.append(QString(".osc.xml"));
+    fileExtensions.append(QString(MIDI_PRESET_EXTENSION));
+    fileExtensions.append(QString(HID_PRESET_EXTENSION));
+    fileExtensions.append(QString(BULK_PRESET_EXTENSION));
 
     loadSupportedPresets();
 }
@@ -216,7 +211,6 @@ void PresetInfoEnumerator::addExtension(const QString extension) {
 }
 
 void PresetInfoEnumerator::loadSupportedPresets() {
-
     foreach (QString dirPath, controllerDirPaths) {
         QDirIterator it(dirPath);
         while (it.hasNext()) {