Added EffectChainPreset

- Added EffectChainPreset class
- Added EffectsManager::loadEffectChainPresets

build/depends.py

@@ -745,6 +745,7 @@ def sources(self, build):
 
                    "src/effects/effectparameter.cpp",
 
+                   "src/effects/effectchainpreset.cpp",
                    "src/effects/effectchainslot.cpp",
                    "src/effects/specialeffectchainslots.cpp",
                    "src/effects/effectslot.cpp",

src/effects/defs.h

@@ -73,6 +73,9 @@ typedef QSharedPointer<EffectParameterSlotBase> EffectParameterSlotBasePointer;
 class EffectChainSlot;
 typedef QSharedPointer<EffectChainSlot> EffectChainSlotPointer;
 
+class EffectChainPreset;
+typedef QSharedPointer<EffectChainPreset> EffectChainPresetPointer;
+
 class StandardEffectChainSlot;
 typedef QSharedPointer<StandardEffectChainSlot> StandardEffectChainSlotPointer;
 

src/effects/effectchainpreset.cpp

@@ -0,0 +1,18 @@
+#include "effects/effectchainpreset.h"
+
+#include "effects/effectxmlelements.h"
+#include "util/xml.h"
+
+EffectChainPreset::EffectChainPreset() {
+}
+
+EffectChainPreset::EffectChainPreset(const QDomElement& element) {
+	VERIFY_OR_DEBUG_ASSERT(element.hasChildNodes()) {
+		return;
+	}
+
+	m_name = XmlParse::selectNodeQString(element, EffectXml::ChainName);
+}
+
+EffectChainPreset::~EffectChainPreset() {
+}

src/effects/effectchainpreset.h

@@ -0,0 +1,24 @@
+#ifndef EFFECTCHAINPRESET_H
+#define EFFECTCHAINPRESET_H
+
+#include <QDomElement>
+
+#include "effects/defs.h"
+
+
+class EffectChainPreset {
+  public:
+	EffectChainPreset();
+	EffectChainPreset(const QDomElement& element);
+	~EffectChainPreset();
+
+	QString name() const {
+		return m_name;
+	}
+
+  private:
+  	QString m_name;
+
+};
+
+#endif /* EFFECTCHAINPRESET_H */

src/effects/effectsmanager.cpp

@@ -1,11 +1,13 @@
 #include "effects/effectsmanager.h"
 
+#include <QDir>
 #include <QMetaType>
 #include <QtAlgorithms>
 
 #include <algorithm>
 
 #include "engine/effects/engineeffectsmanager.h"
+#include "effects/effectchainpreset.h"
 #include "effects/effectsbackend.h"
 #include "effects/effectslot.h"
 #include "effects/effectxmlelements.h"
@@ -272,6 +274,8 @@ EffectManifestPointer EffectsManager::getManifestFromUniqueId(const QString& uid
 }
 
 void EffectsManager::addStandardEffectChainSlots() {
+    EffectChainPresetPointer pPreset = m_effectChainPresets["Default"];
+
     for (int i = 0; i < EffectsManager::kNumStandardEffectChains; ++i) {
         VERIFY_OR_DEBUG_ASSERT(!m_effectChainSlotsByGroup.contains(
                 StandardEffectChainSlot::formatEffectChainSlotGroup(i))) {
@@ -328,7 +332,8 @@ void EffectsManager::addQuickEffectChainSlot(const QString& deckGroupName) {
     m_effectChainSlotsByGroup.insert(pChainSlot->group(), pChainSlot);
 }
 
-EffectChainSlotPointer EffectsManager::getEffectChainSlot(const QString& group) const {
+EffectChainSlotPointer EffectsManager::getEffectChainSlot(
+        const QString& group) const {
     return m_effectChainSlotsByGroup.value(group);
 }
 
@@ -384,6 +389,7 @@ bool EffectsManager::getEffectVisibility(EffectManifestPointer pManifest) {
 }
 
 void EffectsManager::setup() {
+    loadEffectChainPresets();
     // Add postfader effect chain slots
     addStandardEffectChainSlots();
     addOutputEffectChainSlot();
@@ -498,3 +504,31 @@ void EffectsManager::collectGarbage(const EffectsRequest* pRequest) {
                 pRequest->DisableInputChannelForChain.pChannelHandle);
     }
 }
+
+void EffectsManager::loadEffectChainPresets() {
+    QDir settingsPath(m_pConfig->getSettingsPath());
+    QFile file(settingsPath.absoluteFilePath("effects.xml"));
+    QDomDocument doc;
+
+    if (!file.open(QIODevice::ReadOnly)) {
+        return;
+    } else if (!doc.setContent(&file)) {
+        file.close();
+        return;
+    }
+    file.close();
+
+    QDomElement root = doc.documentElement();
+    QDomElement chainsElement = XmlParse::selectElement(root, EffectXml::ChainsRoot);
+    QDomNodeList chainsList = chainsElement.elementsByTagName(EffectXml::Chain);
+
+    for (int i=0; i<chainsList.count(); ++i) {
+        QDomNode chainNode = chainsList.at(i);
+
+        if (chainNode.isElement()) {
+            QDomElement chainElement = chainNode.toElement();
+            EffectChainPresetPointer pPreset(new EffectChainPreset(chainElement));
+            m_effectChainPresets.insert(pPreset->name(), pPreset);
+        }
+    }
+}

src/effects/effectsmanager.h

@@ -106,6 +106,7 @@ class EffectsManager : public QObject {
 
     // NOTE(Kshitij) : Use new functions
     // void loadEffectChains();
+    void loadEffectChainPresets();
 
     // TODO: Remove these methods to reduce coupling between GUI and
     // effects system implementation details.
@@ -187,6 +188,8 @@ class EffectsManager : public QObject {
     QHash<QString, EqualizerEffectChainSlotPointer> m_equalizerEffectChainSlots;
     QHash<QString, QuickEffectChainSlotPointer> m_quickEffectChainSlots;
 
+    QHash<QString, EffectChainPresetPointer> m_effectChainPresets;
+
     DISALLOW_COPY_AND_ASSIGN(EffectsManager);
 };
 

src/effects/effectxmlelements.h

@@ -6,9 +6,6 @@ const int kXmlSchemaVersion = 0;
 const QString Root("MixxxEffects");
 const QString SchemaVersion("SchemaVersion");
 
-const QString Rack("Rack");
-const QString RackGroup("Group");
-
 const QString ChainsRoot("Chains");
 const QString Chain("EffectChain");
 const QString ChainSuperParameter("SuperParameterValue");