summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/controls/bpmcontrol.cpp (renamed from src/engine/bpmcontrol.cpp)2
-rw-r--r--src/engine/controls/bpmcontrol.h (renamed from src/engine/bpmcontrol.h)2
-rw-r--r--src/engine/controls/clockcontrol.cpp (renamed from src/engine/clockcontrol.cpp)4
-rw-r--r--src/engine/controls/clockcontrol.h (renamed from src/engine/clockcontrol.h)2
-rw-r--r--src/engine/controls/cuecontrol.cpp (renamed from src/engine/cuecontrol.cpp)2
-rw-r--r--src/engine/controls/cuecontrol.h (renamed from src/engine/cuecontrol.h)2
-rw-r--r--src/engine/controls/enginecontrol.cpp (renamed from src/engine/enginecontrol.cpp)2
-rw-r--r--src/engine/controls/enginecontrol.h (renamed from src/engine/enginecontrol.h)0
-rw-r--r--src/engine/controls/keycontrol.cpp (renamed from src/engine/keycontrol.cpp)2
-rw-r--r--src/engine/controls/keycontrol.h (renamed from src/engine/keycontrol.h)2
-rw-r--r--src/engine/controls/loopingcontrol.cpp (renamed from src/engine/loopingcontrol.cpp)6
-rw-r--r--src/engine/controls/loopingcontrol.h (renamed from src/engine/loopingcontrol.h)2
-rw-r--r--src/engine/controls/quantizecontrol.cpp (renamed from src/engine/quantizecontrol.cpp)4
-rw-r--r--src/engine/controls/quantizecontrol.h (renamed from src/engine/quantizecontrol.h)2
-rw-r--r--src/engine/controls/ratecontrol.cpp (renamed from src/engine/ratecontrol.cpp)6
-rw-r--r--src/engine/controls/ratecontrol.h (renamed from src/engine/ratecontrol.h)2
-rw-r--r--src/engine/controls/vinylcontrolcontrol.cpp (renamed from src/engine/vinylcontrolcontrol.cpp)2
-rw-r--r--src/engine/controls/vinylcontrolcontrol.h (renamed from src/engine/vinylcontrolcontrol.h)2
-rw-r--r--src/engine/enginebuffer.cpp18
-rw-r--r--src/engine/readaheadmanager.cpp4
-rw-r--r--src/engine/sync/synccontrol.cpp4
-rw-r--r--src/engine/sync/synccontrol.h2
22 files changed, 37 insertions, 37 deletions
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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 10:28:55 +0000