diff options
author | Uwe Klotz <uklotz@mixxx.org> | 2020-09-29 23:21:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-29 23:21:18 +0200 |
commit | 8e0a217781d5f79ebe7efba93d5fe862061ad39c (patch) | |
tree | 405f7fdfd4dd21e9ee129c857d25713f7a563749 /src/engine/controls | |
parent | 8c90972a98dba24e32dba10895ed6f8d907fad10 (diff) | |
parent | c889e0414a3166114d3d000b4959f951441b3737 (diff) |
Merge pull request #3139 from daschuer/track_decl
Externalize forward declarations for Track object
Diffstat (limited to 'src/engine/controls')
-rw-r--r-- | src/engine/controls/bpmcontrol.cpp | 1 | ||||
-rw-r--r-- | src/engine/controls/bpmcontrol.h | 3 | ||||
-rw-r--r-- | src/engine/controls/clockcontrol.cpp | 5 | ||||
-rw-r--r-- | src/engine/controls/clockcontrol.h | 5 | ||||
-rw-r--r-- | src/engine/controls/cuecontrol.cpp | 1 | ||||
-rw-r--r-- | src/engine/controls/cuecontrol.h | 3 | ||||
-rw-r--r-- | src/engine/controls/enginecontrol.h | 3 | ||||
-rw-r--r-- | src/engine/controls/keycontrol.cpp | 1 | ||||
-rw-r--r-- | src/engine/controls/keycontrol.h | 1 | ||||
-rw-r--r-- | src/engine/controls/loopingcontrol.cpp | 2 | ||||
-rw-r--r-- | src/engine/controls/loopingcontrol.h | 2 | ||||
-rw-r--r-- | src/engine/controls/quantizecontrol.cpp | 6 | ||||
-rw-r--r-- | src/engine/controls/quantizecontrol.h | 5 | ||||
-rw-r--r-- | src/engine/controls/vinylcontrolcontrol.cpp | 4 | ||||
-rw-r--r-- | src/engine/controls/vinylcontrolcontrol.h | 6 |
15 files changed, 27 insertions, 21 deletions
diff --git a/src/engine/controls/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp index c2baca7c26..5ada67d431 100644 --- a/src/engine/controls/bpmcontrol.cpp +++ b/src/engine/controls/bpmcontrol.cpp @@ -9,6 +9,7 @@ #include "engine/channels/enginechannel.h" #include "engine/enginebuffer.h" #include "engine/enginemaster.h" +#include "track/track.h" #include "util/assert.h" #include "util/duration.h" #include "util/logger.h" diff --git a/src/engine/controls/bpmcontrol.h b/src/engine/controls/bpmcontrol.h index d191f77ef7..c23716dd1a 100644 --- a/src/engine/controls/bpmcontrol.h +++ b/src/engine/controls/bpmcontrol.h @@ -4,13 +4,14 @@ #include <gtest/gtest_prod.h> #include "control/controlobject.h" +#include "control/controlproxy.h" #include "engine/controls/enginecontrol.h" #include "engine/sync/syncable.h" +#include "track/beats.h" #include "util/tapfilter.h" class ControlObject; class ControlLinPotmeter; -class ControlProxy; class ControlPushButton; class EngineBuffer; class SyncControl; diff --git a/src/engine/controls/clockcontrol.cpp b/src/engine/controls/clockcontrol.cpp index b560de06d9..2a374aa1b4 100644 --- a/src/engine/controls/clockcontrol.cpp +++ b/src/engine/controls/clockcontrol.cpp @@ -1,9 +1,10 @@ #include "engine/controls/clockcontrol.h" #include "control/controlobject.h" -#include "preferences/usersettings.h" -#include "engine/controls/enginecontrol.h" #include "control/controlproxy.h" +#include "engine/controls/enginecontrol.h" +#include "preferences/usersettings.h" +#include "track/track.h" ClockControl::ClockControl(QString group, UserSettingsPointer pConfig) : EngineControl(group, pConfig) { diff --git a/src/engine/controls/clockcontrol.h b/src/engine/controls/clockcontrol.h index 62ebd351d0..719a13bd5d 100644 --- a/src/engine/controls/clockcontrol.h +++ b/src/engine/controls/clockcontrol.h @@ -1,11 +1,10 @@ #ifndef CLOCKCONTROL_H #define CLOCKCONTROL_H -#include "preferences/usersettings.h" #include "engine/controls/enginecontrol.h" - -#include "track/track.h" +#include "preferences/usersettings.h" #include "track/beats.h" +#include "track/track_decl.h" class ControlProxy; class ControlObject; diff --git a/src/engine/controls/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp index e647e773b1..d51e7e8dab 100644 --- a/src/engine/controls/cuecontrol.cpp +++ b/src/engine/controls/cuecontrol.cpp @@ -10,6 +10,7 @@ #include "control/controlpushbutton.h" #include "engine/enginebuffer.h" #include "preferences/colorpalettesettings.h" +#include "track/track.h" #include "util/color/color.h" #include "util/color/predefinedcolorpalettes.h" #include "util/sample.h" diff --git a/src/engine/controls/cuecontrol.h b/src/engine/controls/cuecontrol.h index 60ed7f3b42..6df689e4d0 100644 --- a/src/engine/controls/cuecontrol.h +++ b/src/engine/controls/cuecontrol.h @@ -11,7 +11,8 @@ #include "engine/controls/enginecontrol.h" #include "preferences/colorpalettesettings.h" #include "preferences/usersettings.h" -#include "track/track.h" +#include "track/cue.h" +#include "track/track_decl.h" #define NUM_HOT_CUES 37 diff --git a/src/engine/controls/enginecontrol.h b/src/engine/controls/enginecontrol.h index 1fe3371e5e..d8c4de38b1 100644 --- a/src/engine/controls/enginecontrol.h +++ b/src/engine/controls/enginecontrol.h @@ -14,7 +14,8 @@ #include "engine/effects/groupfeaturestate.h" #include "engine/sync/syncable.h" #include "preferences/usersettings.h" -#include "track/track.h" +#include "track/beats.h" +#include "track/track_decl.h" class EngineMaster; class EngineBuffer; diff --git a/src/engine/controls/keycontrol.cpp b/src/engine/controls/keycontrol.cpp index ed745e5948..cc32cbcfac 100644 --- a/src/engine/controls/keycontrol.cpp +++ b/src/engine/controls/keycontrol.cpp @@ -5,6 +5,7 @@ #include "control/controlobject.h" #include "control/controlpotmeter.h" +#include "control/controlproxy.h" #include "control/controlpushbutton.h" #include "engine/enginebuffer.h" #include "track/keyutils.h" diff --git a/src/engine/controls/keycontrol.h b/src/engine/controls/keycontrol.h index 4dbc59d9f0..622ae59f96 100644 --- a/src/engine/controls/keycontrol.h +++ b/src/engine/controls/keycontrol.h @@ -6,6 +6,7 @@ #include "util/parented_ptr.h" class ControlObject; +class ControlProxy; class ControlPotmeter; class ControlPushButton; diff --git a/src/engine/controls/loopingcontrol.cpp b/src/engine/controls/loopingcontrol.cpp index fbce5c8a8d..64b86e711b 100644 --- a/src/engine/controls/loopingcontrol.cpp +++ b/src/engine/controls/loopingcontrol.cpp @@ -14,9 +14,7 @@ #include "util/compatibility.h" #include "util/math.h" #include "util/sample.h" - #include "track/track.h" -#include "track/beats.h" double LoopingControl::s_dBeatSizes[] = { 0.03125, 0.0625, 0.125, 0.25, 0.5, 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }; diff --git a/src/engine/controls/loopingcontrol.h b/src/engine/controls/loopingcontrol.h index d130aefb9f..3faaea34ea 100644 --- a/src/engine/controls/loopingcontrol.h +++ b/src/engine/controls/loopingcontrol.h @@ -13,7 +13,7 @@ #include "engine/controls/ratecontrol.h" #include "preferences/usersettings.h" #include "track/beats.h" -#include "track/track.h" +#include "track/track_decl.h" #define MINIMUM_AUDIBLE_LOOP_SIZE 300 // In samples diff --git a/src/engine/controls/quantizecontrol.cpp b/src/engine/controls/quantizecontrol.cpp index 0960edf22a..e038e46b0a 100644 --- a/src/engine/controls/quantizecontrol.cpp +++ b/src/engine/controls/quantizecontrol.cpp @@ -2,13 +2,15 @@ // Created on Sat 5, 2011 // Author: pwhelan +#include "engine/controls/quantizecontrol.h" + #include <QtDebug> #include "control/controlobject.h" -#include "preferences/usersettings.h" #include "control/controlpushbutton.h" -#include "engine/controls/quantizecontrol.h" #include "engine/controls/enginecontrol.h" +#include "preferences/usersettings.h" +#include "track/track.h" #include "util/assert.h" QuantizeControl::QuantizeControl(QString group, diff --git a/src/engine/controls/quantizecontrol.h b/src/engine/controls/quantizecontrol.h index ad59fbb188..b3bb56a627 100644 --- a/src/engine/controls/quantizecontrol.h +++ b/src/engine/controls/quantizecontrol.h @@ -3,11 +3,10 @@ #include <QObject> -#include "preferences/usersettings.h" #include "engine/controls/enginecontrol.h" - -#include "track/track.h" +#include "preferences/usersettings.h" #include "track/beats.h" +#include "track/track_decl.h" class ControlObject; class ControlPushButton; diff --git a/src/engine/controls/vinylcontrolcontrol.cpp b/src/engine/controls/vinylcontrolcontrol.cpp index bece0ae145..5de2b30563 100644 --- a/src/engine/controls/vinylcontrolcontrol.cpp +++ b/src/engine/controls/vinylcontrolcontrol.cpp @@ -1,8 +1,8 @@ #include "engine/controls/vinylcontrolcontrol.h" -#include "vinylcontrol/vinylcontrol.h" -#include "track/cue.h" +#include "track/track.h" #include "util/math.h" +#include "vinylcontrol/vinylcontrol.h" VinylControlControl::VinylControlControl(QString group, UserSettingsPointer pConfig) : EngineControl(group, pConfig), diff --git a/src/engine/controls/vinylcontrolcontrol.h b/src/engine/controls/vinylcontrolcontrol.h index 0984d14ffe..9129337a13 100644 --- a/src/engine/controls/vinylcontrolcontrol.h +++ b/src/engine/controls/vinylcontrolcontrol.h @@ -1,12 +1,12 @@ #ifndef VINYLCONTROLCONTROL_H #define VINYLCONTROLCONTROL_H -#include "engine/controls/enginecontrol.h" -#include "track/track.h" -#include "preferences/usersettings.h" #include "control/controlobject.h" #include "control/controlproxy.h" #include "control/controlpushbutton.h" +#include "engine/controls/enginecontrol.h" +#include "preferences/usersettings.h" +#include "track/track_decl.h" class VinylControlControl : public EngineControl { Q_OBJECT |