move EngineControls to their own folder

35 files changed, 58 insertions, 59 deletions

diff --git a/build/depends.py b/build/depends.py
index 678c253a67..516edc4362 100644
--- a/build/depends.py
+++ b/build/depends.py
@@ -818,16 +818,15 @@ class MixxxCore(Feature):
                    "src/engine/enginedeck.cpp",
                    "src/engine/engineaux.cpp",
                    "src/engine/channelmixer_autogen.cpp",
-
-                   "src/engine/enginecontrol.cpp",
-                   "src/engine/ratecontrol.cpp",
                    "src/engine/positionscratchcontroller.cpp",
-                   "src/engine/loopingcontrol.cpp",
-                   "src/engine/bpmcontrol.cpp",
-                   "src/engine/keycontrol.cpp",
-                   "src/engine/cuecontrol.cpp",
-                   "src/engine/quantizecontrol.cpp",
-                   "src/engine/clockcontrol.cpp",
+                   "src/engine/controls/bpmcontrol.cpp",
+                   "src/engine/controls/clockcontrol.cpp",
+                   "src/engine/controls/cuecontrol.cpp",
+                   "src/engine/controls/enginecontrol.cpp",
+                   "src/engine/controls/keycontrol.cpp",
+                   "src/engine/controls/loopingcontrol.cpp",
+                   "src/engine/controls/quantizecontrol.cpp",
+                   "src/engine/controls/ratecontrol.cpp",
                    "src/engine/readaheadmanager.cpp",
                    "src/engine/enginetalkoverducking.cpp",
                    "src/engine/cachingreader.cpp",
diff --git a/build/features.py b/build/features.py
index 399ce035d3..48060fcd5f 100644
--- a/build/features.py
+++ b/build/features.py
@@ -318,7 +318,7 @@ class VinylControl(Feature):
                    'src/vinylcontrol/vinylcontrolmanager.cpp',
                    'src/vinylcontrol/vinylcontrolprocessor.cpp',
                    'src/vinylcontrol/steadypitch.cpp',
-                   'src/engine/vinylcontrolcontrol.cpp', ]
+                   'src/engine/controls/vinylcontrolcontrol.cpp', ]
         if build.platform_is_windows:
             sources.append("lib/xwax/timecoder_win32.cpp")
             sources.append("lib/xwax/lut_win32.cpp")
diff --git a/src/controllers/controlpickermenu.cpp b/src/controllers/controlpickermenu.cpp
index 1c5fdb18c6..a989d3af43 100644
--- a/src/controllers/controlpickermenu.cpp
+++ b/src/controllers/controlpickermenu.cpp
@@ -2,8 +2,8 @@
 
 #include "vinylcontrol/defs_vinylcontrol.h"
 #include "mixer/playermanager.h"
-#include "engine/cuecontrol.h"
-#include "engine/loopingcontrol.h"
+#include "engine/controls/cuecontrol.h"
+#include "engine/controls/loopingcontrol.h"
 #include "effects/effectrack.h"
 #include "effects/effectchainslot.h"
 #include "effects/effectslot.h"
diff --git a/src/engine/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp
index 013fe53213..87d4278b6a 100644
--- a/src/engine/bpmcontrol.cpp
+++ b/src/engine/controls/bpmcontrol.cpp
@@ -5,7 +5,7 @@
 #include "control/controllinpotmeter.h"
 
 #include "engine/enginebuffer.h"
-#include "engine/bpmcontrol.h"
+#include "engine/controls/bpmcontrol.h"
 #include "waveform/visualplayposition.h"
 #include "engine/enginechannel.h"
 #include "engine/enginemaster.h"
diff --git a/src/engine/bpmcontrol.h b/src/engine/controls/bpmcontrol.h
index a715179ee0..b802e8f353 100644
--- a/src/engine/bpmcontrol.h
+++ b/src/engine/controls/bpmcontrol.h
@@ -4,7 +4,7 @@
 #include <gtest/gtest_prod.h>
 
 #include "control/controlobject.h"
-#include "engine/enginecontrol.h"
+#include "engine/controls/enginecontrol.h"
 #include "engine/sync/syncable.h"
 #include "util/tapfilter.h"
 
diff --git a/src/engine/clockcontrol.cpp b/src/engine/controls/clockcontrol.cpp
index b5ed799467..7335cbc197 100644
--- a/src/engine/clockcontrol.cpp
+++ b/src/engine/controls/clockcontrol.cpp
@@ -1,8 +1,8 @@
-#include "engine/clockcontrol.h"
+#include "engine/controls/clockcontrol.h"
 
 #include "control/controlobject.h"
 #include "preferences/usersettings.h"
-#include "engine/enginecontrol.h"
+#include "engine/controls/enginecontrol.h"
 #include "control/controlproxy.h"
 
 ClockControl::ClockControl(QString group, UserSettingsPointer pConfig)
diff --git a/src/engine/clockcontrol.h b/src/engine/controls/clockcontrol.h
index 132edd454b..004945ba49 100644
--- a/src/engine/clockcontrol.h
+++ b/src/engine/controls/clockcontrol.h
@@ -2,7 +2,7 @@
 #define CLOCKCONTROL_H
 
 #include "preferences/usersettings.h"
-#include "engine/enginecontrol.h"
+#include "engine/controls/enginecontrol.h"
 
 #include "track/track.h"
 #include "track/beats.h"
diff --git a/src/engine/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp
index 98db7acfd3..31e7a882e1 100644
--- a/src/engine/cuecontrol.cpp
+++ b/src/engine/controls/cuecontrol.cpp
@@ -5,7 +5,7 @@
 #include <QStringBuilder>
 
 #include "engine/enginebuffer.h"
-#include "engine/cuecontrol.h"
+#include "engine/controls/cuecontrol.h"
 
 #include "control/controlobject.h"
 #include "control/controlpushbutton.h"
diff --git a/src/engine/cuecontrol.h b/src/engine/controls/cuecontrol.h
index c9d82c06f8..cec7ff86a3 100644
--- a/src/engine/cuecontrol.h
+++ b/src/engine/controls/cuecontrol.h
@@ -7,7 +7,7 @@
 #include <QList>
 #include <QMutex>
 
-#include "engine/enginecontrol.h"
+#include "engine/controls/enginecontrol.h"
 #include "preferences/usersettings.h"
 #include "control/controlproxy.h"
 #include "track/track.h"
diff --git a/src/engine/enginecontrol.cpp b/src/engine/controls/enginecontrol.cpp
index 14fe7dc659..a70c49a264 100644
--- a/src/engine/enginecontrol.cpp
+++ b/src/engine/controls/enginecontrol.cpp
@@ -1,7 +1,7 @@
 // enginecontrol.cpp
 // Created 7/5/2009 by RJ Ryan (rryan@mit.edu)
 
-#include "engine/enginecontrol.h"
+#include "engine/controls/enginecontrol.h"
 #include "engine/enginemaster.h"
 #include "engine/enginebuffer.h"
 #include "engine/sync/enginesync.h"
diff --git a/src/engine/enginecontrol.h b/src/engine/controls/enginecontrol.h
index 3d85173a1d..3d85173a1d 100644
--- a/src/engine/enginecontrol.h
+++ b/src/engine/controls/enginecontrol.h
diff --git a/src/engine/keycontrol.cpp b/src/engine/controls/keycontrol.cpp
index 2d648e4f39..b7cccdc3de 100644
--- a/src/engine/keycontrol.cpp
+++ b/src/engine/controls/keycontrol.cpp
@@ -1,7 +1,7 @@
 #include <QtDebug>
 #include <QPair>
 
-#include "engine/keycontrol.h"
+#include "engine/controls/keycontrol.h"
 
 #include "control/controlobject.h"
 #include "control/controlpushbutton.h"
diff --git a/src/engine/keycontrol.h b/src/engine/controls/keycontrol.h
index 4e4b6701e7..28f7a88869 100644
--- a/src/engine/keycontrol.h
+++ b/src/engine/controls/keycontrol.h
@@ -1,7 +1,7 @@
 #ifndef KEYCONTROL_H
 #define KEYCONTROL_H
 
-#include "engine/enginecontrol.h"
+#include "engine/controls/enginecontrol.h"
 #include "control/controlvalue.h"
 
 class ControlObject;
diff --git a/src/engine/loopingcontrol.cpp b/src/engine/controls/loopingcontrol.cpp
index b19c10e93b..98734b4eb4 100644
--- a/src/engine/loopingcontrol.cpp
+++ b/src/engine/controls/loopingcontrol.cpp
@@ -7,9 +7,9 @@
 #include "control/controlobject.h"
 #include "preferences/usersettings.h"
 #include "control/controlpushbutton.h"
-#include "engine/loopingcontrol.h"
-#include "engine/bpmcontrol.h"
-#include "engine/enginecontrol.h"
+#include "engine/controls/loopingcontrol.h"
+#include "engine/controls/bpmcontrol.h"
+#include "engine/controls/enginecontrol.h"
 #include "util/compatibility.h"
 #include "util/math.h"
 #include "util/sample.h"
diff --git a/src/engine/loopingcontrol.h b/src/engine/controls/loopingcontrol.h
index 34f1811d8c..0d8de1fb87 100644
--- a/src/engine/loopingcontrol.h
+++ b/src/engine/controls/loopingcontrol.h
@@ -9,7 +9,7 @@
 #include <QStack>
 
 #include "preferences/usersettings.h"
-#include "engine/enginecontrol.h"
+#include "engine/controls/enginecontrol.h"
 #include "track/track.h"
 #include "track/beats.h"
 #include "control/controlvalue.h"
diff --git a/src/engine/quantizecontrol.cpp b/src/engine/controls/quantizecontrol.cpp
index 1154f9d385..91cf4d7bc9 100644
--- a/src/engine/quantizecontrol.cpp
+++ b/src/engine/controls/quantizecontrol.cpp
@@ -7,8 +7,8 @@
 #include "control/controlobject.h"
 #include "preferences/usersettings.h"
 #include "control/controlpushbutton.h"
-#include "engine/quantizecontrol.h"
-#include "engine/enginecontrol.h"
+#include "engine/controls/quantizecontrol.h"
+#include "engine/controls/enginecontrol.h"
 #include "util/assert.h"
 
 QuantizeControl::QuantizeControl(QString group,
diff --git a/src/engine/quantizecontrol.h b/src/engine/controls/quantizecontrol.h
index d2f828dcf6..1c89355e3c 100644
--- a/src/engine/quantizecontrol.h
+++ b/src/engine/controls/quantizecontrol.h
@@ -4,7 +4,7 @@
 #include <QObject>
 
 #include "preferences/usersettings.h"
-#include "engine/enginecontrol.h"
+#include "engine/controls/enginecontrol.h"
 
 #include "track/track.h"
 #include "track/beats.h"
diff --git a/src/engine/ratecontrol.cpp b/src/engine/controls/ratecontrol.cpp
index cd372e852a..e51ec0a69d 100644
--- a/src/engine/ratecontrol.cpp
+++ b/src/engine/controls/ratecontrol.cpp
@@ -10,9 +10,9 @@
 #include "util/math.h"
 #include "vinylcontrol/defs_vinylcontrol.h"
 
-#include "engine/bpmcontrol.h"
-#include "engine/enginecontrol.h"
-#include "engine/ratecontrol.h"
+#include "engine/controls/bpmcontrol.h"
+#include "engine/controls/enginecontrol.h"
+#include "engine/controls/ratecontrol.h"
 #include "engine/positionscratchcontroller.h"
 
 #include <QtDebug>
diff --git a/src/engine/ratecontrol.h b/src/engine/controls/ratecontrol.h
index 2653b786a4..97ea85c5b8 100644
--- a/src/engine/ratecontrol.h
+++ b/src/engine/controls/ratecontrol.h
@@ -7,7 +7,7 @@
 #include <QObject>
 
 #include "preferences/usersettings.h"
-#include "engine/enginecontrol.h"
+#include "engine/controls/enginecontrol.h"
 #include "engine/sync/syncable.h"
 
 const int RATE_TEMP_STEP = 500;
diff --git a/src/engine/vinylcontrolcontrol.cpp b/src/engine/controls/vinylcontrolcontrol.cpp
index 428628e0d4..69e3c64925 100644
--- a/src/engine/vinylcontrolcontrol.cpp
+++ b/src/engine/controls/vinylcontrolcontrol.cpp
@@ -1,4 +1,4 @@
-#include "engine/vinylcontrolcontrol.h"
+#include "engine/controls/vinylcontrolcontrol.h"
 
 #include "vinylcontrol/vinylcontrol.h"
 #include "library/dao/cue.h"
diff --git a/src/engine/vinylcontrolcontrol.h b/src/engine/controls/vinylcontrolcontrol.h
index 0c9783475e..0984d14ffe 100644
--- a/src/engine/vinylcontrolcontrol.h
+++ b/src/engine/controls/vinylcontrolcontrol.h
@@ -1,7 +1,7 @@
 #ifndef VINYLCONTROLCONTROL_H
 #define VINYLCONTROLCONTROL_H
 
-#include "engine/enginecontrol.h"
+#include "engine/controls/enginecontrol.h"
 #include "track/track.h"
 #include "preferences/usersettings.h"
 #include "control/controlobject.h"
diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp
index 1a7687230b..b7f4aae2fd 100644
--- a/src/engine/enginebuffer.cpp
+++ b/src/engine/enginebuffer.cpp
@@ -9,20 +9,20 @@
 #include "control/controlproxy.h"
 #include "control/controlpotmeter.h"
 #include "control/controlpushbutton.h"
-#include "engine/bpmcontrol.h"
-#include "engine/clockcontrol.h"
-#include "engine/cuecontrol.h"
+#include "engine/controls/bpmcontrol.h"
+#include "engine/controls/clockcontrol.h"
+#include "engine/controls/cuecontrol.h"
+#include "engine/controls/enginecontrol.h"
+#include "engine/controls/keycontrol.h"
+#include "engine/controls/loopingcontrol.h"
+#include "engine/controls/quantizecontrol.h"
+#include "engine/controls/ratecontrol.h"
 #include "engine/enginebufferscalelinear.h"
 #include "engine/enginebufferscalerubberband.h"
 #include "engine/enginebufferscalest.h"
 #include "engine/enginechannel.h"
-#include "engine/enginecontrol.h"
 #include "engine/enginemaster.h"
 #include "engine/engineworkerscheduler.h"
-#include "engine/keycontrol.h"
-#include "engine/loopingcontrol.h"
-#include "engine/quantizecontrol.h"
-#include "engine/ratecontrol.h"
 #include "engine/readaheadmanager.h"
 #include "engine/sync/enginesync.h"
 #include "engine/sync/synccontrol.h"
@@ -38,7 +38,7 @@
 #include "waveform/visualplayposition.h"
 
 #ifdef __VINYLCONTROL__
-#include "engine/vinylcontrolcontrol.h"
+#include "engine/controls/vinylcontrolcontrol.h"
 #endif
 
 namespace {
diff --git a/src/engine/readaheadmanager.cpp b/src/engine/readaheadmanager.cpp
index 25ca710308..369f258423 100644
--- a/src/engine/readaheadmanager.cpp
+++ b/src/engine/readaheadmanager.cpp
@@ -4,8 +4,8 @@
 #include "engine/readaheadmanager.h"
 
 #include "engine/cachingreader.h"
-#include "engine/loopingcontrol.h"
-#include "engine/ratecontrol.h"
+#include "engine/controls/loopingcontrol.h"
+#include "engine/controls/ratecontrol.h"
 #include "util/defs.h"
 #include "util/math.h"
 #include "util/sample.h"
diff --git a/src/engine/sync/synccontrol.cpp b/src/engine/sync/synccontrol.cpp
index eb7a0b2f8b..9d0eb88ba0 100644
--- a/src/engine/sync/synccontrol.cpp
+++ b/src/engine/sync/synccontrol.cpp
@@ -3,10 +3,10 @@
 #include "control/controlobject.h"
 #include "control/controlpushbutton.h"
 #include "control/controlproxy.h"
-#include "engine/bpmcontrol.h"
+#include "engine/controls/bpmcontrol.h"
+#include "engine/controls/ratecontrol.h"
 #include "engine/enginebuffer.h"
 #include "engine/enginechannel.h"
-#include "engine/ratecontrol.h"
 #include "util/math.h"
 #include "util/assert.h"
 
diff --git a/src/engine/sync/synccontrol.h b/src/engine/sync/synccontrol.h
index d2d127bd0d..8c72e87442 100644
--- a/src/engine/sync/synccontrol.h
+++ b/src/engine/sync/synccontrol.h
@@ -4,7 +4,7 @@
 #include <QScopedPointer>
 #include <gtest/gtest_prod.h>
 
-#include "engine/enginecontrol.h"
+#include "engine/controls/enginecontrol.h"
 #include "engine/sync/syncable.h"
 
 class EngineChannel;
diff --git a/src/mixer/basetrackplayer.cpp b/src/mixer/basetrackplayer.cpp
index 9025ca12e2..740f14434c 100644
--- a/src/mixer/basetrackplayer.cpp
+++ b/src/mixer/basetrackplayer.cpp
@@ -8,7 +8,7 @@
 #include "track/track.h"
 #include "sources/soundsourceproxy.h"
 #include "engine/enginebuffer.h"
-#include "engine/enginecontrol.h"
+#include "engine/controls/enginecontrol.h"
 #include "engine/enginedeck.h"
 #include "engine/enginemaster.h"
 #include "track/beatgrid.h"
diff --git a/src/preferences/dialog/dlgprefdeck.cpp b/src/preferences/dialog/dlgprefdeck.cpp
index fb2059eb47..937d3104e0 100644
--- a/src/preferences/dialog/dlgprefdeck.cpp
+++ b/src/preferences/dialog/dlgprefdeck.cpp
@@ -13,7 +13,7 @@
 #include "control/controlproxy.h"
 #include "widget/wnumberpos.h"
 #include "engine/enginebuffer.h"
-#include "engine/ratecontrol.h"
+#include "engine/controls/ratecontrol.h"
 #include "mixer/playermanager.h"
 #include "mixer/playerinfo.h"
 #include "control/controlobject.h"
diff --git a/src/preferences/dialog/dlgprefdeck.h b/src/preferences/dialog/dlgprefdeck.h
index bd7e0bd79f..10788e02d2 100644
--- a/src/preferences/dialog/dlgprefdeck.h
+++ b/src/preferences/dialog/dlgprefdeck.h
@@ -3,7 +3,7 @@
 
 #include <QWidget>
 
-#include "engine/ratecontrol.h"
+#include "engine/controls/ratecontrol.h"
 #include "preferences/constants.h"
 #include "preferences/dialog/ui_dlgprefdeckdlg.h"
 #include "preferences/usersettings.h"
diff --git a/src/test/bpmcontrol_test.cpp b/src/test/bpmcontrol_test.cpp
index 1409793c85..764db3e6b7 100644
--- a/src/test/bpmcontrol_test.cpp
+++ b/src/test/bpmcontrol_test.cpp
@@ -6,7 +6,7 @@
 #include "mixxxtest.h"
 #include "control/controlobject.h"
 #include "control/controlpushbutton.h"
-#include "engine/bpmcontrol.h"
+#include "engine/controls/bpmcontrol.h"
 #include "track/beats.h"
 #include "track/beatfactory.h"
 #include "track/beatgrid.h"
diff --git a/src/test/enginesynctest.cpp b/src/test/enginesynctest.cpp
index 15d3a9aa36..d924b79d11 100644
--- a/src/test/enginesynctest.cpp
+++ b/src/test/enginesynctest.cpp
@@ -12,7 +12,7 @@
 
 #include "preferences/usersettings.h"
 #include "control/controlobject.h"
-#include "engine/bpmcontrol.h"
+#include "engine/controls/bpmcontrol.h"
 #include "engine/sync/synccontrol.h"
 #include "test/mockedenginebackendtest.h"
 #include "test/mixxxtest.h"
diff --git a/src/test/looping_control_test.cpp b/src/test/looping_control_test.cpp
index 50949687b3..3026810dd4 100644
--- a/src/test/looping_control_test.cpp
+++ b/src/test/looping_control_test.cpp
@@ -7,7 +7,7 @@
 #include "control/controlobject.h"
 #include "control/controlpushbutton.h"
 #include "control/controlproxy.h"
-#include "engine/loopingcontrol.h"
+#include "engine/controls/loopingcontrol.h"
 #include "test/mockedenginebackendtest.h"
 #include "util/memory.h"
 
diff --git a/src/test/mockedenginebackendtest.h b/src/test/mockedenginebackendtest.h
index 55649a1edd..8150c61890 100644
--- a/src/test/mockedenginebackendtest.h
+++ b/src/test/mockedenginebackendtest.h
@@ -15,7 +15,7 @@
 #include "engine/enginechannel.h"
 #include "engine/enginedeck.h"
 #include "engine/enginemaster.h"
-#include "engine/ratecontrol.h"
+#include "engine/controls/ratecontrol.h"
 #include "engine/sync/enginesync.h"
 #include "mixer/deck.h"
 #include "mixer/previewdeck.h"
diff --git a/src/test/readaheadmanager_test.cpp b/src/test/readaheadmanager_test.cpp
index 69281f402c..5ab56772cd 100644
--- a/src/test/readaheadmanager_test.cpp
+++ b/src/test/readaheadmanager_test.cpp
@@ -5,7 +5,7 @@
 
 #include "engine/cachingreader.h"
 #include "control/controlobject.h"
-#include "engine/loopingcontrol.h"
+#include "engine/controls/loopingcontrol.h"
 #include "engine/readaheadmanager.h"
 #include "test/mixxxtest.h"
 #include "util/assert.h"
diff --git a/src/test/signalpathtest.h b/src/test/signalpathtest.h
index 4d5c0fcafc..ca430e87f5 100644
--- a/src/test/signalpathtest.h
+++ b/src/test/signalpathtest.h
@@ -16,7 +16,7 @@
 #include "engine/enginechannel.h"
 #include "engine/enginedeck.h"
 #include "engine/enginemaster.h"
-#include "engine/ratecontrol.h"
+#include "engine/controls/ratecontrol.h"
 #include "engine/sync/enginesync.h"
 #include "mixer/previewdeck.h"
 #include "mixer/sampler.h"
diff --git a/src/waveform/renderers/waveformmarkset.cpp b/src/waveform/renderers/waveformmarkset.cpp
index f3c7028e37..3865930a7d 100644
--- a/src/waveform/renderers/waveformmarkset.cpp
+++ b/src/waveform/renderers/waveformmarkset.cpp
@@ -2,7 +2,7 @@
 #include <QtDebug>
 
 #include "waveformmarkset.h"
-#include "engine/cuecontrol.h"
+#include "engine/controls/cuecontrol.h"
 #include "control/controlobject.h"
 #include "util/memory.h"