Created Backend specific visibility group

mixxxdj · May 29, 2018 · c3079c3 · c3079c3
1 parent ff90165
commit c3079c3
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 19 deletions.
diff --git a/src/effects/effectmanifest.h b/src/effects/effectmanifest.h
@@ -134,15 +134,25 @@ class EffectManifest final {
         m_metaknobDefault = metaknobDefault;
     }
 
-    static QString backendTypeToTranslatedString(EffectBackendType type) {
-        switch (type) {
+    QString backendName() {
+        switch (m_backendType) {
+            case EffectBackendType::BuiltIn:
+                return QString("Built-in");
+            case EffectBackendType::LV2:
+                return QString("LV2");
+            default:
+                return QString("Unknown");
+        }
+    }
+    QString translatedBackendName() {
+        switch (m_backendType) {
             case EffectBackendType::BuiltIn:
                 //: Used for effects that are built into Mixxx
                 return QObject::tr("Built-in");
             case EffectBackendType::LV2:
                 return QString("LV2");
             default:
-                return QString("");
+                return QString();
         }
     }
     static EffectBackendType backendTypeFromString(const QString& name) {

diff --git a/src/effects/effectsbackend.cpp b/src/effects/effectsbackend.cpp
@@ -14,10 +14,6 @@ EffectsBackend::~EffectsBackend() {
     m_effectIds.clear();
 }
 
-const EffectBackendType EffectsBackend::getType() const {
-    return m_type;
-}
-
 void EffectsBackend::registerEffect(const QString& id,
                                     EffectManifestPointer pManifest,
                                     EffectInstantiatorPointer pInstantiator) {

diff --git a/src/effects/effectsbackend.h b/src/effects/effectsbackend.h
@@ -24,8 +24,6 @@ class EffectsBackend : public QObject {
     EffectsBackend(QObject* pParent, EffectBackendType type);
     virtual ~EffectsBackend();
 
-    virtual const EffectBackendType getType() const;
-
     // returns a list sorted like it should be displayed in the GUI 
     virtual const QList<QString> getEffectIds() const;
     virtual EffectManifestPointer getManifest(const QString& effectId) const;
@@ -50,6 +48,8 @@ class EffectsBackend : public QObject {
                         new EffectProcessorInstantiator<EffectProcessorImpl>()));
     }
 
+    EffectBackendType m_type;
+
   private:
     class RegisteredEffect {
       public:
@@ -69,7 +69,6 @@ class EffectsBackend : public QObject {
         EffectInstantiatorPointer m_pInitator;
     };
 
-    EffectBackendType m_type;
     QMap<QString, RegisteredEffect> m_registeredEffects;
     QList<QString> m_effectIds;
 };

diff --git a/src/effects/effectsmanager.cpp b/src/effects/effectsmanager.cpp
@@ -3,6 +3,8 @@
 #include <QMetaType>
 #include <QtAlgorithms>
 
+#include <algorithm>
+
 #include "engine/effects/engineeffectsmanager.h"
 #include "effects/effectchainmanager.h"
 #include "effects/effectsbackend.h"
@@ -69,9 +71,7 @@ EffectsManager::~EffectsManager() {
 bool alphabetizeEffectManifests(EffectManifestPointer pManifest1,
                                 EffectManifestPointer pManifest2) {
     int dNameComp = QString::localeAwareCompare(pManifest1->displayName(), pManifest2->displayName());
-    int bNameComp = QString::localeAwareCompare(
-                        EffectManifest::backendTypeToTranslatedString(pManifest1->backendType()), 
-                        EffectManifest::backendTypeToTranslatedString(pManifest2->backendType()));
+    int bNameComp = static_cast<int>(pManifest1->backendType()) - static_cast<int>(pManifest2->backendType());
     // Add an exception for "Built-in" backends, to keep the Built-in effects in the beginning
     return (bNameComp ? (bNameComp < 0) : (dNameComp < 0));
 }

diff --git a/src/effects/lv2/lv2backend.cpp b/src/effects/lv2/lv2backend.cpp
@@ -27,7 +27,7 @@ void LV2Backend::enumeratePlugins() {
             continue;
         }
         LV2Manifest* lv2Manifest = new LV2Manifest(plug, m_properties);
-        lv2Manifest->getEffectManifest()->setBackendType(getType());
+        lv2Manifest->getEffectManifest()->setBackendType(m_type);
         m_registeredEffects.insert(lv2Manifest->getEffectManifest()->id(),
                                    lv2Manifest);
     }

diff --git a/src/preferences/dialog/dlgprefeffects.cpp b/src/preferences/dialog/dlgprefeffects.cpp
@@ -13,14 +13,14 @@ DlgPrefEffects::DlgPrefEffects(QWidget* pParent,
     setupUi(this);
 
     m_availableEffectsModel.resetFromEffectManager(pEffectsManager);
-    for (auto profile : m_availableEffectsModel.profiles()) {
+    for (auto& profile : m_availableEffectsModel.profiles()) {
         EffectManifestPointer pManifest = profile->pManifest;
 
         // Users are likely to have lots of external plugins installed and 
         // many of them are useless for DJing. To avoid cluttering the list 
         // shown in WEffectSelector, blacklist external plugins by default.
         bool defaultValue = (pManifest->backendType() == EffectBackendType::BuiltIn);
-        bool visible = m_pConfig->getValue<bool>(ConfigKey("[Visible Effects]", 
+        bool visible = m_pConfig->getValue<bool>(ConfigKey("[Visible " + pManifest->backendName() + " Effects]", 
                                                  pManifest->id()), defaultValue);
         profile->bIsVisible = visible;
         m_pEffectsManager->setEffectVisibility(pManifest, visible);
@@ -62,7 +62,8 @@ void DlgPrefEffects::slotApply() {
     for (EffectProfilePtr profile : m_availableEffectsModel.profiles()) {
         EffectManifestPointer pManifest = profile->pManifest;
         m_pEffectsManager->setEffectVisibility(pManifest, profile->bIsVisible);
-        m_pConfig->set(ConfigKey("[Visible Effects]", pManifest->id()), ConfigValue(profile->bIsVisible));
+        m_pConfig->set(ConfigKey("[Visible " + pManifest->backendName() + " Effects]", pManifest->id()), 
+                       ConfigValue(profile->bIsVisible));
     }
 }
 
@@ -90,5 +91,5 @@ void DlgPrefEffects::availableEffectsListItemSelected(const QModelIndex& selecte
     effectAuthor->setText(pManifest->author());
     effectDescription->setText(pManifest->description());
     effectVersion->setText(pManifest->version());
-    effectType->setText(EffectManifest::backendTypeToTranslatedString(pManifest->backendType()));
+    effectType->setText(pManifest->translatedBackendName());
 }
diff --git a/src/preferences/effectsettingsmodel.cpp b/src/preferences/effectsettingsmodel.cpp
@@ -85,7 +85,7 @@ QVariant EffectSettingsModel::data(const QModelIndex& index, int role) const {
         } else if (column == kColumnName && role == Qt::DisplayRole) {
             return profile->pManifest->displayName();
         } else if (column == kColumnType && role == Qt::DisplayRole) {
-            return EffectManifest::backendTypeToTranslatedString(profile->pManifest->backendType());
+            return profile->pManifest->translatedBackendName();
         }
     }