Merge pull request mixxxdj#1674 from kshitij98/effect_blacklisting

Effect Blacklisting

build/depends.py

@@ -748,6 +748,7 @@ def sources(self, build):
                    "preferences/broadcastsettings.cpp",
                    "preferences/broadcastsettings_legacy.cpp",
                    "preferences/broadcastsettingsmodel.cpp",
+                   "preferences/effectsettingsmodel.cpp",
                    "preferences/broadcastprofile.cpp",
                    "preferences/upgrade.cpp",
                    "preferences/dlgpreferencepage.cpp",
@@ -769,26 +770,26 @@ def sources(self, build):
                    "effects/effectchainmanager.cpp",
                    "effects/effectsbackend.cpp",
 
-                   "effects/native/nativebackend.cpp",
-                   "effects/native/bitcrushereffect.cpp",
-                   "effects/native/balanceeffect.cpp",
-                   "effects/native/linkwitzriley8eqeffect.cpp",
-                   "effects/native/bessel4lvmixeqeffect.cpp",
-                   "effects/native/bessel8lvmixeqeffect.cpp",
-                   "effects/native/threebandbiquadeqeffect.cpp",
-                   "effects/native/biquadfullkilleqeffect.cpp",
-                   "effects/native/loudnesscontoureffect.cpp",
-                   "effects/native/graphiceqeffect.cpp",
-                   "effects/native/parametriceqeffect.cpp",
-                   "effects/native/flangereffect.cpp",
-                   "effects/native/filtereffect.cpp",
-                   "effects/native/moogladder4filtereffect.cpp",
-                   "effects/native/reverbeffect.cpp",
-                   "effects/native/echoeffect.cpp",
-                   "effects/native/autopaneffect.cpp",
-                   "effects/native/phasereffect.cpp",
-                   "effects/native/metronomeeffect.cpp",
-                   "effects/native/tremoloeffect.cpp",
+                   "effects/builtin/builtinbackend.cpp",
+                   "effects/builtin/bitcrushereffect.cpp",
+                   "effects/builtin/balanceeffect.cpp",
+                   "effects/builtin/linkwitzriley8eqeffect.cpp",
+                   "effects/builtin/bessel4lvmixeqeffect.cpp",
+                   "effects/builtin/bessel8lvmixeqeffect.cpp",
+                   "effects/builtin/threebandbiquadeqeffect.cpp",
+                   "effects/builtin/biquadfullkilleqeffect.cpp",
+                   "effects/builtin/loudnesscontoureffect.cpp",
+                   "effects/builtin/graphiceqeffect.cpp",
+                   "effects/builtin/parametriceqeffect.cpp",
+                   "effects/builtin/flangereffect.cpp",
+                   "effects/builtin/filtereffect.cpp",
+                   "effects/builtin/moogladder4filtereffect.cpp",
+                   "effects/builtin/reverbeffect.cpp",
+                   "effects/builtin/echoeffect.cpp",
+                   "effects/builtin/autopaneffect.cpp",
+                   "effects/builtin/phasereffect.cpp",
+                   "effects/builtin/metronomeeffect.cpp",
+                   "effects/builtin/tremoloeffect.cpp",
 
                    "engine/effects/engineeffectsmanager.cpp",
                    "engine/effects/engineeffectrack.cpp",

src/broadcast/broadcastmanager.cpp

@@ -93,13 +93,13 @@ void BroadcastManager::slotControlEnabled(double v) {
         bool atLeastOneEnabled = false;
         QList<BroadcastProfilePtr> profiles = m_pBroadcastSettings->profiles();
         for(BroadcastProfilePtr profile : profiles) {
-            if(profile->getEnabled()) {
+            if (profile->getEnabled()) {
                 atLeastOneEnabled = true;
                 break;
             }
         }
 
-        if(!atLeastOneEnabled) {
+        if (!atLeastOneEnabled) {
             m_pBroadcastEnabled->set(false);
             emit(broadcastEnabled(0.0));
             QMessageBox::warning(nullptr, tr("Action failed"),
@@ -112,7 +112,7 @@ void BroadcastManager::slotControlEnabled(double v) {
         m_pStatusCO->forceSet(STATUSCO_UNCONNECTED);
         QList<BroadcastProfilePtr> profiles = m_pBroadcastSettings->profiles();
         for(BroadcastProfilePtr profile : profiles) {
-           if(profile->connectionStatus() == BroadcastProfile::STATUS_FAILURE) {
+           if (profile->connectionStatus() == BroadcastProfile::STATUS_FAILURE) {
                profile->setConnectionStatus(BroadcastProfile::STATUS_UNCONNECTED);
            }
         }
@@ -133,9 +133,9 @@ void BroadcastManager::slotProfilesChanged() {
     QVector<NetworkOutputStreamWorkerPtr> workers = m_pNetworkStream->outputWorkers();
     for(NetworkOutputStreamWorkerPtr pWorker : workers) {
         ShoutConnectionPtr connection = qSharedPointerCast<ShoutConnection>(pWorker);
-        if(connection) {
+        if (connection) {
             BroadcastProfilePtr profile = connection->profile();
-            if(profile->connectionStatus() == BroadcastProfile::STATUS_FAILURE
+            if (profile->connectionStatus() == BroadcastProfile::STATUS_FAILURE
                     && !profile->getEnabled()) {
                 profile->setConnectionStatus(BroadcastProfile::STATUS_UNCONNECTED);
             }
@@ -145,10 +145,10 @@ void BroadcastManager::slotProfilesChanged() {
 }
 
 bool BroadcastManager::addConnection(BroadcastProfilePtr profile) {
-    if(!profile)
+    if (!profile)
         return false;
 
-    if(findConnectionForProfile(profile).isNull() == false) {
+    if (findConnectionForProfile(profile).isNull() == false) {
         return false;
     }
 
@@ -164,11 +164,11 @@ bool BroadcastManager::addConnection(BroadcastProfilePtr profile) {
 }
 
 bool BroadcastManager::removeConnection(BroadcastProfilePtr profile) {
-    if(!profile)
+    if (!profile)
         return false;
 
     ShoutConnectionPtr connection = findConnectionForProfile(profile);
-    if(connection) {
+    if (connection) {
         disconnect(profile.data(), SIGNAL(connectionStatusChanged(int)),
                    this, SLOT(slotConnectionStatusChanged(int)));
 
@@ -188,10 +188,10 @@ ShoutConnectionPtr BroadcastManager::findConnectionForProfile(BroadcastProfilePt
     QVector<NetworkOutputStreamWorkerPtr> workers = m_pNetworkStream->outputWorkers();
     for(NetworkOutputStreamWorkerPtr pWorker : workers) {
         ShoutConnectionPtr connection = qSharedPointerCast<ShoutConnection>(pWorker);
-        if(connection.isNull())
+        if (connection.isNull())
             continue;
 
-        if(connection->profile() == profile) {
+        if (connection->profile() == profile) {
             return connection;
         }
     }
@@ -207,7 +207,7 @@ void BroadcastManager::slotConnectionStatusChanged(int newState) {
     // Collect status info
     QList<BroadcastProfilePtr> profiles = m_pBroadcastSettings->profiles();
     for (BroadcastProfilePtr profile : profiles) {
-        if(!profile->getEnabled()) {
+        if (!profile->getEnabled()) {
             continue;
         }
         enabledCount++;

src/effects/native/autopaneffect.cpp → src/effects/builtin/autopaneffect.cpp

@@ -1,4 +1,4 @@
-#include "effects/native/autopaneffect.h"
+#include "effects/builtin/autopaneffect.h"
 
 #include <QtDebug>
 

src/effects/native/bessel4lvmixeqeffect.cpp → src/effects/builtin/bessel4lvmixeqeffect.cpp

@@ -1,6 +1,6 @@
-#include "effects/native/bessel4lvmixeqeffect.h"
+#include "effects/builtin/bessel4lvmixeqeffect.h"
 
-#include "effects/native/equalizer_util.h"
+#include "effects/builtin/equalizer_util.h"
 #include "util/math.h"
 
 // static

src/effects/native/bessel4lvmixeqeffect.h → src/effects/builtin/bessel4lvmixeqeffect.h

@@ -6,7 +6,7 @@
 #include "control/controlproxy.h"
 #include "effects/effect.h"
 #include "effects/effectprocessor.h"
-#include "effects/native/lvmixeqbase.h"
+#include "effects/builtin/lvmixeqbase.h"
 #include "engine/effects/engineeffect.h"
 #include "engine/effects/engineeffectparameter.h"
 #include "engine/enginefilterbessel4.h"

src/effects/native/bessel8lvmixeqeffect.cpp → src/effects/builtin/bessel8lvmixeqeffect.cpp

@@ -1,6 +1,6 @@
-#include "effects/native/bessel8lvmixeqeffect.h"
+#include "effects/builtin/bessel8lvmixeqeffect.h"
 
-#include "effects/native/equalizer_util.h"
+#include "effects/builtin/equalizer_util.h"
 #include "util/math.h"
 
 // static

src/effects/native/bessel8lvmixeqeffect.h → src/effects/builtin/bessel8lvmixeqeffect.h

@@ -1,7 +1,7 @@
 #ifndef BESSEL8LVMIXEQEFFECT_H
 #define BESSEL8LVMIXEQEFFECT_H
 
-#include "effects/native/lvmixeqbase.h"
+#include "effects/builtin/lvmixeqbase.h"
 
 #include <QMap>
 

src/effects/native/biquadfullkilleqeffect.cpp → src/effects/builtin/biquadfullkilleqeffect.cpp

@@ -1,6 +1,6 @@
-#include "effects/native/biquadfullkilleqeffect.h"
+#include "effects/builtin/biquadfullkilleqeffect.h"
 
-#include "effects/native/equalizer_util.h"
+#include "effects/builtin/equalizer_util.h"
 #include "util/math.h"
 
 namespace {

src/effects/native/biquadfullkilleqeffect.h → src/effects/builtin/biquadfullkilleqeffect.h

@@ -8,7 +8,7 @@
 #include "engine/effects/engineeffectparameter.h"
 #include "engine/enginefilterbiquad1.h"
 #include "engine/enginefilterbessel4.h"
-#include "effects/native/lvmixeqbase.h"
+#include "effects/builtin/lvmixeqbase.h"
 #include "engine/enginefilterdelay.h"
 #include "util/class.h"
 #include "util/defs.h"

src/effects/native/bitcrushereffect.cpp → src/effects/builtin/bitcrushereffect.cpp

@@ -1,4 +1,4 @@
-#include "effects/native/bitcrushereffect.h"
+#include "effects/builtin/bitcrushereffect.h"
 
 #include "util/sample.h"
 

src/effects/builtin/builtinbackend.cpp

@@ -0,0 +1,59 @@
+
+#include <QtDebug>
+
+#include "effects/builtin/builtinbackend.h"
+#include "effects/builtin/flangereffect.h"
+#include "effects/builtin/bitcrushereffect.h"
+#include "effects/builtin/balanceeffect.h"
+#include "effects/builtin/linkwitzriley8eqeffect.h"
+#include "effects/builtin/bessel8lvmixeqeffect.h"
+#include "effects/builtin/bessel4lvmixeqeffect.h"
+#include "effects/builtin/threebandbiquadeqeffect.h"
+#include "effects/builtin/biquadfullkilleqeffect.h"
+#include "effects/builtin/graphiceqeffect.h"
+#include "effects/builtin/parametriceqeffect.h"
+#include "effects/builtin/filtereffect.h"
+#include "effects/builtin/moogladder4filtereffect.h"
+#ifndef __MACAPPSTORE__
+#include "effects/builtin/reverbeffect.h"
+#endif
+#include "effects/builtin/echoeffect.h"
+#include "effects/builtin/autopaneffect.h"
+#include "effects/builtin/phasereffect.h"
+#include "effects/builtin/loudnesscontoureffect.h"
+#include "effects/builtin/metronomeeffect.h"
+#include "effects/builtin/tremoloeffect.h"
+
+BuiltInBackend::BuiltInBackend(QObject* pParent)
+        : EffectsBackend(pParent, EffectBackendType::BuiltIn) {
+    // Keep this list in a reasonable order
+    // Mixing EQs
+    registerEffect<Bessel4LVMixEQEffect>();
+    registerEffect<Bessel8LVMixEQEffect>();
+    registerEffect<LinkwitzRiley8EQEffect>();
+    registerEffect<ThreeBandBiquadEQEffect>();
+    registerEffect<BiquadFullKillEQEffect>();
+    // Compensations EQs
+    registerEffect<GraphicEQEffect>();
+    registerEffect<ParametricEQEffect>();
+    registerEffect<LoudnessContourEffect>();
+    // Fading Effects
+    registerEffect<FilterEffect>();
+    registerEffect<MoogLadder4FilterEffect>();
+    registerEffect<BitCrusherEffect>();
+    registerEffect<BalanceEffect>();
+    // Fancy effects
+    registerEffect<FlangerEffect>();
+    registerEffect<EchoEffect>();
+    registerEffect<AutoPanEffect>();
+#ifndef __MACAPPSTORE__
+    registerEffect<ReverbEffect>();
+#endif
+    registerEffect<PhaserEffect>();
+    registerEffect<MetronomeEffect>();
+    registerEffect<TremoloEffect>();
+}
+
+BuiltInBackend::~BuiltInBackend() {
+    //qDebug() << debugString() << "destroyed";
+}

src/effects/builtin/builtinbackend.h

@@ -0,0 +1,19 @@
+#ifndef BUILTINBACKEND_H
+#define BUILTINBACKEND_H
+
+#include "effects/defs.h"
+#include "effects/effectsbackend.h"
+
+class BuiltInBackend : public EffectsBackend {
+    Q_OBJECT
+  public:
+    BuiltInBackend(QObject* pParent);
+    virtual ~BuiltInBackend();
+
+  private:
+    QString debugString() const {
+        return "BuiltInBackend";
+    }
+};
+
+#endif /* BUILTINBACKEND_H */

src/effects/native/echoeffect.cpp → src/effects/builtin/echoeffect.cpp

@@ -1,4 +1,4 @@
-#include "effects/native/echoeffect.h"
+#include "effects/builtin/echoeffect.h"
 
 #include <QtDebug>
 

src/effects/native/equalizer_util.h → src/effects/builtin/equalizer_util.h

@@ -1,5 +1,5 @@
-#ifndef EFFECTS_NATIVE_EQUALIZER_UTIL_H
-#define EFFECTS_NATIVE_EQUALIZER_UTIL_H
+#ifndef EFFECTS_BUILTIN_EQUALIZER_UTIL_H
+#define EFFECTS_BUILTIN_EQUALIZER_UTIL_H
 
 #include <QObject>
 
@@ -94,4 +94,4 @@ class EqualizerUtil {
 };
 
 
-#endif /* EFFECTS_NATIVE_EQUALIZER_UTIL_H */
+#endif /* EFFECTS_BUILTIN_EQUALIZER_UTIL_H */

src/effects/native/filtereffect.cpp → src/effects/builtin/filtereffect.cpp

@@ -1,4 +1,4 @@
-#include "effects/native/filtereffect.h"
+#include "effects/builtin/filtereffect.h"
 #include "util/math.h"
 
 namespace {

src/effects/native/flangereffect.cpp → src/effects/builtin/flangereffect.cpp

@@ -1,4 +1,4 @@
-#include "effects/native/flangereffect.h"
+#include "effects/builtin/flangereffect.h"
 
 #include <QtDebug>
 

src/effects/native/graphiceqeffect.cpp → src/effects/builtin/graphiceqeffect.cpp

@@ -1,4 +1,4 @@
-#include "effects/native/graphiceqeffect.h"
+#include "effects/builtin/graphiceqeffect.h"
 #include "util/math.h"
 
 #define Q 1.2247449

src/effects/native/linkwitzriley8eqeffect.cpp → src/effects/builtin/linkwitzriley8eqeffect.cpp

@@ -1,6 +1,6 @@
-#include "effects/native/linkwitzriley8eqeffect.h"
+#include "effects/builtin/linkwitzriley8eqeffect.h"
 
-#include "effects/native/equalizer_util.h"
+#include "effects/builtin/equalizer_util.h"
 #include "util/math.h"
 
 static const unsigned int kStartupSamplerate = 44100;

src/effects/native/loudnesscontoureffect.cpp → src/effects/builtin/loudnesscontoureffect.cpp

@@ -1,4 +1,4 @@
-#include "effects/native/loudnesscontoureffect.h"
+#include "effects/builtin/loudnesscontoureffect.h"
 #include "util/math.h"
 
 namespace {

src/effects/native/moogladder4filtereffect.cpp → src/effects/builtin/moogladder4filtereffect.cpp

@@ -1,4 +1,4 @@
-#include "effects/native/moogladder4filtereffect.h"
+#include "effects/builtin/moogladder4filtereffect.h"
 #include "util/math.h"
 
 

src/effects/native/parametriceqeffect.cpp → src/effects/builtin/parametriceqeffect.cpp

@@ -1,4 +1,4 @@
-#include "effects/native/parametriceqeffect.h"
+#include "effects/builtin/parametriceqeffect.h"
 #include "util/math.h"
 
 namespace {

src/effects/native/phasereffect.cpp → src/effects/builtin/phasereffect.cpp

@@ -1,4 +1,4 @@
-#include "effects/native/phasereffect.h"
+#include "effects/builtin/phasereffect.h"
 
 #include <QDebug>
 

src/effects/native/reverbeffect.cpp → src/effects/builtin/reverbeffect.cpp

@@ -1,4 +1,4 @@
-#include "effects/native/reverbeffect.h"
+#include "effects/builtin/reverbeffect.h"
 
 #include <QtDebug>
 

src/effects/native/threebandbiquadeqeffect.cpp → src/effects/builtin/threebandbiquadeqeffect.cpp

@@ -1,6 +1,6 @@
-#include "effects/native/threebandbiquadeqeffect.h"
+#include "effects/builtin/threebandbiquadeqeffect.h"
 
-#include "effects/native/equalizer_util.h"
+#include "effects/builtin/equalizer_util.h"
 #include "util/math.h"
 
 namespace {

src/effects/native/tremoloeffect.cpp → src/effects/builtin/tremoloeffect.cpp

@@ -1,4 +1,4 @@
-#include "effects/native/tremoloeffect.h"
+#include "effects/builtin/tremoloeffect.h"
 
 namespace {
 //  Used to avoid gain discontinuities when changing parameters too fast

src/effects/defs.h

@@ -11,6 +11,12 @@ enum class EffectEnableState {
     Enabling
 };
 
+enum class EffectBackendType {
+    BuiltIn,
+    LV2,
+    Unknown
+};
+
 enum class SignalProcessingStage {
     Prefader,
     Postfader