Merge remote-tracking branch 'upstream/master' into lv2_support2

Conflicts:
	.travis.yml
	src/effects/effect.cpp
	src/effects/effect.h
	src/effects/effectchainmanager.h
	src/effects/effectinstantiator.h
	src/effects/effectmanifest.h
	src/effects/effectrack.cpp
	src/effects/native/autopaneffect.cpp
	src/effects/native/balanceeffect.cpp
	src/effects/native/biquadfullkilleqeffect.h
	src/effects/native/bitcrushereffect.cpp
	src/effects/native/echoeffect.cpp
	src/effects/native/echoeffect.h
	src/effects/native/filtereffect.cpp
	src/effects/native/flangereffect.cpp
	src/effects/native/loudnesscontoureffect.cpp
	src/effects/native/phasereffect.cpp
	src/effects/native/reverbeffect.cpp
	src/effects/native/threebandbiquadeqeffect.h
	src/engine/effects/engineeffect.cpp
	src/engine/effects/engineeffect.h
	src/mixxx.cpp
	src/preferences/dialog/dlgpreferences.cpp
	src/preferences/dialog/dlgpreferences.h
	src/test/metaknob_link_test.cpp
	src/test/nativeeffects_test.cpp

1 files changed, 16 insertions, 21 deletions

diff --git a/src/effects/effectchain.h b/src/effects/effectchain.h
index 37543bc214..ad5243f69b 100644
--- a/src/effects/effectchain.h
+++ b/src/effects/effectchain.h
@@ -6,8 +6,9 @@
 #include <QList>
 #include <QDomDocument>
 
-#include "effects/effect.h"
+#include "effects/defs.h"
 #include "engine/channelhandle.h"
+#include "effects/effect.h"
 #include "util/class.h"
 
 class EffectsManager;
@@ -38,10 +39,10 @@ class EffectChain : public QObject {
     void setEnabled(bool enabled);
 
     // Activates EffectChain processing for the provided channel.
-    void enableForChannel(const ChannelHandleAndGroup& handle_group);
+    void enableForInputChannel(const ChannelHandleAndGroup& handle_group);
     bool enabledForChannel(const ChannelHandleAndGroup& handle_group) const;
     const QSet<ChannelHandleAndGroup>& enabledChannels() const;
-    void disableForChannel(const ChannelHandleAndGroup& handle_group);
+    void disableForInputChannel(const ChannelHandleAndGroup& handle_group);
 
     EffectChainPointer prototype() const;
 
@@ -56,34 +57,28 @@ class EffectChain : public QObject {
     double mix() const;
     void setMix(const double& dMix);
 
-    enum InsertionType {
-        INSERT = 0,
-        SEND,
-        // The number of insertion types. Also used to represent "unknown".
-        NUM_INSERTION_TYPES
-    };
-    static QString insertionTypeToString(InsertionType type) {
+    static QString insertionTypeToString(EffectChainInsertionType type) {
         switch (type) {
-            case INSERT:
+            case EffectChainInsertionType::Insert:
                 return "INSERT";
-            case SEND:
+            case EffectChainInsertionType::Send:
                 return "SEND";
             default:
                 return "UNKNOWN";
         }
     }
-    static InsertionType insertionTypeFromString(const QString& typeStr) {
+    static EffectChainInsertionType insertionTypeFromString(const QString& typeStr) {
         if (typeStr == "INSERT") {
-            return INSERT;
+            return EffectChainInsertionType::Insert;
         } else if (typeStr == "SEND") {
-            return SEND;
+            return EffectChainInsertionType::Send;
         } else {
-            return NUM_INSERTION_TYPES;
+            return EffectChainInsertionType::Num_Insertion_Types;
         }
     }
 
-    InsertionType insertionType() const;
-    void setInsertionType(InsertionType type);
+    EffectChainInsertionType insertionType() const;
+    void setInsertionType(EffectChainInsertionType type);
 
     void addEffect(EffectPointer pEffect);
     void replaceEffect(unsigned int effectSlotNumber, EffectPointer pEffect);
@@ -106,7 +101,7 @@ class EffectChain : public QObject {
     void descriptionChanged(const QString& name);
     void enabledChanged(bool enabled);
     void mixChanged(double v);
-    void insertionTypeChanged(EffectChain::InsertionType type);
+    void insertionTypeChanged(EffectChainInsertionType type);
     void channelStatusChanged(const QString& group, bool enabled);
 
   private:
@@ -123,10 +118,10 @@ class EffectChain : public QObject {
     QString m_id;
     QString m_name;
     QString m_description;
-    InsertionType m_insertionType;
+    EffectChainInsertionType m_insertionType;
     double m_dMix;
 
-    QSet<ChannelHandleAndGroup> m_enabledChannels;
+    QSet<ChannelHandleAndGroup> m_enabledInputChannels;
     QList<EffectPointer> m_effects;
     EngineEffectChain* m_pEngineEffectChain;
     bool m_bAddedToEngine;