move EngineChannel classes to their own folder

27 files changed, 30 insertions, 30 deletions

diff --git a/src/engine/engineaux.cpp b/src/engine/channels/engineaux.cpp
index 0ec6fef0be..bfe44b6501 100644
--- a/src/engine/engineaux.cpp
+++ b/src/engine/channels/engineaux.cpp
@@ -2,7 +2,7 @@
 // created 4/8/2011 by Bill Good (bkgood@gmail.com)
 // shameless stolen from enginemicrophone.cpp (from RJ)
 
-#include "engine/engineaux.h"
+#include "engine/channels/engineaux.h"
 
 #include <QtDebug>
 
diff --git a/src/engine/engineaux.h b/src/engine/channels/engineaux.h
index f7d814f2b6..cf01a5aad3 100644
--- a/src/engine/engineaux.h
+++ b/src/engine/channels/engineaux.h
@@ -9,7 +9,7 @@
 
 #include "control/controlproxy.h"
 #include "control/controlpushbutton.h"
-#include "engine/enginechannel.h"
+#include "engine/channels/enginechannel.h"
 #include "util/circularbuffer.h"
 #include "soundio/soundmanagerutil.h"
 
diff --git a/src/engine/enginechannel.cpp b/src/engine/channels/enginechannel.cpp
index 314fed9897..6c46d1a8ba 100644
--- a/src/engine/enginechannel.cpp
+++ b/src/engine/channels/enginechannel.cpp
@@ -15,7 +15,7 @@
 *                                                                         *
 ***************************************************************************/
 
-#include "engine/enginechannel.h"
+#include "engine/channels/enginechannel.h"
 
 #include "control/controlobject.h"
 #include "control/controlpushbutton.h"
diff --git a/src/engine/enginechannel.h b/src/engine/channels/enginechannel.h
index 2ea5b464d1..2ea5b464d1 100644
--- a/src/engine/enginechannel.h
+++ b/src/engine/channels/enginechannel.h
diff --git a/src/engine/enginedeck.cpp b/src/engine/channels/enginedeck.cpp
index 1c90edeae0..797f200f97 100644
--- a/src/engine/enginedeck.cpp
+++ b/src/engine/channels/enginedeck.cpp
@@ -15,7 +15,7 @@
 *                                                                         *
 ***************************************************************************/
 
-#include "engine/enginedeck.h"
+#include "engine/channels/enginedeck.h"
 
 #include "control/controlpushbutton.h"
 #include "effects/effectsmanager.h"
diff --git a/src/engine/enginedeck.h b/src/engine/channels/enginedeck.h
index 2480cc715b..2e68486429 100644
--- a/src/engine/enginedeck.h
+++ b/src/engine/channels/enginedeck.h
@@ -24,7 +24,7 @@
 #include "control/controlproxy.h"
 #include "control/controlpushbutton.h"
 #include "engine/engineobject.h"
-#include "engine/enginechannel.h"
+#include "engine/channels/enginechannel.h"
 #include "util/circularbuffer.h"
 
 #include "soundio/soundmanagerutil.h"
diff --git a/src/engine/enginemicrophone.cpp b/src/engine/channels/enginemicrophone.cpp
index c1b7bbfcc8..8fbae380b7 100644
--- a/src/engine/enginemicrophone.cpp
+++ b/src/engine/channels/enginemicrophone.cpp
@@ -1,7 +1,7 @@
 // enginemicrophone.cpp
 // created 3/16/2011 by RJ Ryan (rryan@mit.edu)
 
-#include "engine/enginemicrophone.h"
+#include "engine/channels/enginemicrophone.h"
 
 #include <QtDebug>
 
diff --git a/src/engine/enginemicrophone.h b/src/engine/channels/enginemicrophone.h
index ccded526ad..f3ac6f0b3e 100644
--- a/src/engine/enginemicrophone.h
+++ b/src/engine/channels/enginemicrophone.h
@@ -8,7 +8,7 @@
 
 #include "control/controlproxy.h"
 #include "control/controlpushbutton.h"
-#include "engine/enginechannel.h"
+#include "engine/channels/enginechannel.h"
 #include "engine/enginevumeter.h"
 #include "util/circularbuffer.h"
 
diff --git a/src/engine/controls/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp
index 87d4278b6a..0ff25ec230 100644
--- a/src/engine/controls/bpmcontrol.cpp
+++ b/src/engine/controls/bpmcontrol.cpp
@@ -7,7 +7,7 @@
 #include "engine/enginebuffer.h"
 #include "engine/controls/bpmcontrol.h"
 #include "waveform/visualplayposition.h"
-#include "engine/enginechannel.h"
+#include "engine/channels/enginechannel.h"
 #include "engine/enginemaster.h"
 #include "control/controlproxy.h"
 #include "util/assert.h"
diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp
index 4a5e0f1743..ccb0ddc11f 100644
--- a/src/engine/enginebuffer.cpp
+++ b/src/engine/enginebuffer.cpp
@@ -20,7 +20,7 @@
 #include "engine/enginebufferscalelinear.h"
 #include "engine/enginebufferscalerubberband.h"
 #include "engine/enginebufferscalest.h"
-#include "engine/enginechannel.h"
+#include "engine/channels/enginechannel.h"
 #include "engine/enginemaster.h"
 #include "engine/engineworkerscheduler.h"
 #include "engine/readaheadmanager.h"
diff --git a/src/engine/enginemaster.cpp b/src/engine/enginemaster.cpp
index 721dc07f4a..c0a94426f4 100644
--- a/src/engine/enginemaster.cpp
+++ b/src/engine/enginemaster.cpp
@@ -14,8 +14,8 @@
 #include "engine/effects/engineeffectsmanager.h"
 #include "engine/enginebuffer.h"
 #include "engine/enginebuffer.h"
-#include "engine/enginechannel.h"
-#include "engine/enginedeck.h"
+#include "engine/channels/enginechannel.h"
+#include "engine/channels/enginedeck.h"
 #include "engine/enginedelay.h"
 #include "engine/enginetalkoverducking.h"
 #include "engine/enginevumeter.h"
diff --git a/src/engine/enginemaster.h b/src/engine/enginemaster.h
index 5a2fa72ed9..15eb6ce7d6 100644
--- a/src/engine/enginemaster.h
+++ b/src/engine/enginemaster.h
@@ -25,7 +25,7 @@
 #include "control/controlobject.h"
 #include "control/controlpushbutton.h"
 #include "engine/engineobject.h"
-#include "engine/enginechannel.h"
+#include "engine/channels/enginechannel.h"
 #include "engine/channelhandle.h"
 #include "soundio/soundmanager.h"
 #include "soundio/soundmanagerutil.h"
diff --git a/src/engine/sync/enginesync.cpp b/src/engine/sync/enginesync.cpp
index 9b0436e95e..8bee7877a6 100644
--- a/src/engine/sync/enginesync.cpp
+++ b/src/engine/sync/enginesync.cpp
@@ -21,7 +21,7 @@
 #include <QStringList>
 
 #include "engine/enginebuffer.h"
-#include "engine/enginechannel.h"
+#include "engine/channels/enginechannel.h"
 #include "engine/sync/internalclock.h"
 #include "util/assert.h"
 
diff --git a/src/engine/sync/internalclock.h b/src/engine/sync/internalclock.h
index 407497f5b1..2da64f2342 100644
--- a/src/engine/sync/internalclock.h
+++ b/src/engine/sync/internalclock.h
@@ -7,7 +7,7 @@
 
 #include "engine/sync/clock.h"
 #include "engine/sync/syncable.h"
-#include "engine/enginechannel.h"
+#include "engine/channels/enginechannel.h"
 
 class ControlObject;
 class ControlLinPotmeter;
diff --git a/src/engine/sync/synccontrol.cpp b/src/engine/sync/synccontrol.cpp
index 9d0eb88ba0..985f6588ad 100644
--- a/src/engine/sync/synccontrol.cpp
+++ b/src/engine/sync/synccontrol.cpp
@@ -6,7 +6,7 @@
 #include "engine/controls/bpmcontrol.h"
 #include "engine/controls/ratecontrol.h"
 #include "engine/enginebuffer.h"
-#include "engine/enginechannel.h"
+#include "engine/channels/enginechannel.h"
 #include "util/math.h"
 #include "util/assert.h"
 
diff --git a/src/library/autodj/autodjprocessor.h b/src/library/autodj/autodjprocessor.h
index 8a560a50b9..fe5dcec544 100644
--- a/src/library/autodj/autodjprocessor.h
+++ b/src/library/autodj/autodjprocessor.h
@@ -7,7 +7,7 @@
 
 #include "preferences/usersettings.h"
 #include "control/controlproxy.h"
-#include "engine/enginechannel.h"
+#include "engine/channels/enginechannel.h"
 #include "library/playlisttablemodel.h"
 #include "track/track.h"
 #include "util/class.h"
diff --git a/src/mixer/auxiliary.cpp b/src/mixer/auxiliary.cpp
index 37f1b111be..c6a7c08fca 100644
--- a/src/mixer/auxiliary.cpp
+++ b/src/mixer/auxiliary.cpp
@@ -1,6 +1,6 @@
 #include "mixer/auxiliary.h"
 
-#include "engine/engineaux.h"
+#include "engine/channels/engineaux.h"
 #include "engine/enginemaster.h"
 #include "soundio/soundmanager.h"
 #include "soundio/soundmanagerutil.h"
diff --git a/src/mixer/basetrackplayer.cpp b/src/mixer/basetrackplayer.cpp
index 8d1e0070ad..83d75a2920 100644
--- a/src/mixer/basetrackplayer.cpp
+++ b/src/mixer/basetrackplayer.cpp
@@ -9,7 +9,7 @@
 #include "sources/soundsourceproxy.h"
 #include "engine/enginebuffer.h"
 #include "engine/controls/enginecontrol.h"
-#include "engine/enginedeck.h"
+#include "engine/channels/enginedeck.h"
 #include "engine/enginemaster.h"
 #include "track/beatgrid.h"
 #include "waveform/renderers/waveformwidgetrenderer.h"
diff --git a/src/mixer/basetrackplayer.h b/src/mixer/basetrackplayer.h
index ce50d5a441..eb39bcc470 100644
--- a/src/mixer/basetrackplayer.h
+++ b/src/mixer/basetrackplayer.h
@@ -6,8 +6,8 @@
 #include <QString>
 
 #include "preferences/usersettings.h"
-#include "engine/enginechannel.h"
-#include "engine/enginedeck.h"
+#include "engine/channels/enginechannel.h"
+#include "engine/channels/enginedeck.h"
 #include "mixer/baseplayer.h"
 #include "track/track.h"
 #include "util/memory.h"
diff --git a/src/mixer/microphone.cpp b/src/mixer/microphone.cpp
index 33e5f5c21b..295150ee39 100644
--- a/src/mixer/microphone.cpp
+++ b/src/mixer/microphone.cpp
@@ -2,7 +2,7 @@
 
 #include "control/controlproxy.h"
 #include "engine/enginemaster.h"
-#include "engine/enginemicrophone.h"
+#include "engine/channels/enginemicrophone.h"
 #include "soundio/soundmanager.h"
 #include "soundio/soundmanagerutil.h"
 
diff --git a/src/mixer/playerinfo.cpp b/src/mixer/playerinfo.cpp
index dd38804712..e1a9c80d02 100644
--- a/src/mixer/playerinfo.cpp
+++ b/src/mixer/playerinfo.cpp
@@ -19,7 +19,7 @@
 #include <QMutexLocker>
 
 #include "control/controlobject.h"
-#include "engine/enginechannel.h"
+#include "engine/channels/enginechannel.h"
 #include "engine/enginexfader.h"
 #include "mixer/playermanager.h"
 
diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp
index 8b97f37175..c58bc23beb 100644
--- a/src/mixer/playermanager.cpp
+++ b/src/mixer/playermanager.cpp
@@ -8,7 +8,7 @@
 #include "control/controlobject.h"
 #include "effects/effectsmanager.h"
 #include "effects/effectrack.h"
-#include "engine/enginedeck.h"
+#include "engine/channels/enginedeck.h"
 #include "engine/enginemaster.h"
 #include "library/library.h"
 #include "mixer/auxiliary.h"
diff --git a/src/soundio/soundmanagerutil.cpp b/src/soundio/soundmanagerutil.cpp
index f0a6fd29d0..31ab76d816 100644
--- a/src/soundio/soundmanagerutil.cpp
+++ b/src/soundio/soundmanagerutil.cpp
@@ -15,7 +15,7 @@
 
 #include "soundio/soundmanagerutil.h"
 
-#include "engine/enginechannel.h"
+#include "engine/channels/enginechannel.h"
 
 /**
  * Constructs a ChannelGroup.
diff --git a/src/test/enginemastertest.cpp b/src/test/enginemastertest.cpp
index c125ebfded..761afd903f 100644
--- a/src/test/enginemastertest.cpp
+++ b/src/test/enginemastertest.cpp
@@ -4,7 +4,7 @@
 #include <QtDebug>
 
 #include "control/controlproxy.h"
-#include "engine/enginechannel.h"
+#include "engine/channels/enginechannel.h"
 #include "engine/enginemaster.h"
 #include "test/mixxxtest.h"
 #include "test/signalpathtest.h"
diff --git a/src/test/enginemicrophonetest.cpp b/src/test/enginemicrophonetest.cpp
index f3c64f8c7f..ccdedefb31 100644
--- a/src/test/enginemicrophonetest.cpp
+++ b/src/test/enginemicrophonetest.cpp
@@ -5,7 +5,7 @@
 #include "test/signalpathtest.h"
 #include "preferences/usersettings.h"
 #include "control/controlobject.h"
-#include "engine/enginemicrophone.h"
+#include "engine/channels/enginemicrophone.h"
 #include "soundio/soundmanagerutil.h"
 #include "util/defs.h"
 #include "util/sample.h"
diff --git a/src/test/mockedenginebackendtest.h b/src/test/mockedenginebackendtest.h
index 8150c61890..9c64ac0433 100644
--- a/src/test/mockedenginebackendtest.h
+++ b/src/test/mockedenginebackendtest.h
@@ -12,8 +12,8 @@
 #include "effects/effectsmanager.h"
 #include "engine/enginebuffer.h"
 #include "engine/enginebufferscale.h"
-#include "engine/enginechannel.h"
-#include "engine/enginedeck.h"
+#include "engine/channels/enginechannel.h"
+#include "engine/channels/enginedeck.h"
 #include "engine/enginemaster.h"
 #include "engine/controls/ratecontrol.h"
 #include "engine/sync/enginesync.h"
diff --git a/src/test/signalpathtest.h b/src/test/signalpathtest.h
index ba830e9466..deccb79a4b 100644
--- a/src/test/signalpathtest.h
+++ b/src/test/signalpathtest.h
@@ -13,8 +13,8 @@
 #include "effects/effectsmanager.h"
 #include "engine/enginebuffer.h"
 #include "engine/enginebufferscale.h"
-#include "engine/enginechannel.h"
-#include "engine/enginedeck.h"
+#include "engine/channels/enginechannel.h"
+#include "engine/channels/enginedeck.h"
 #include "engine/enginemaster.h"
 #include "engine/controls/ratecontrol.h"
 #include "engine/sync/enginesync.h"