Merge pull request #3139 from daschuer/track_decl

Externalize forward declarations for Track object

23 files changed, 50 insertions, 41 deletions

diff --git a/src/engine/cachingreader/cachingreader.h b/src/engine/cachingreader/cachingreader.h
index 0cecd4232c..24b039f11e 100644
--- a/src/engine/cachingreader/cachingreader.h
+++ b/src/engine/cachingreader/cachingreader.h
@@ -13,7 +13,7 @@
 #include "engine/cachingreader/cachingreaderworker.h"
 #include "engine/engineworker.h"
 #include "preferences/usersettings.h"
-#include "track/track.h"
+#include "track/track_decl.h"
 #include "util/fifo.h"
 #include "util/types.h"
 
diff --git a/src/engine/cachingreader/cachingreaderworker.cpp b/src/engine/cachingreader/cachingreaderworker.cpp
index 07fa181cd7..3f13a059cd 100644
--- a/src/engine/cachingreader/cachingreaderworker.cpp
+++ b/src/engine/cachingreader/cachingreaderworker.cpp
@@ -6,6 +6,7 @@
 
 #include "control/controlobject.h"
 #include "sources/soundsourceproxy.h"
+#include "track/track.h"
 #include "util/compatibility.h"
 #include "util/event.h"
 #include "util/logger.h"
diff --git a/src/engine/cachingreader/cachingreaderworker.h b/src/engine/cachingreader/cachingreaderworker.h
index 8588f3cb31..eb0f68081c 100644
--- a/src/engine/cachingreader/cachingreaderworker.h
+++ b/src/engine/cachingreader/cachingreaderworker.h
@@ -1,19 +1,18 @@
 #ifndef ENGINE_CACHINGREADERWORKER_H
 #define ENGINE_CACHINGREADERWORKER_H
 
-#include <QtDebug>
 #include <QMutex>
 #include <QSemaphore>
-#include <QThread>
 #include <QString>
+#include <QThread>
+#include <QtDebug>
 
 #include "engine/cachingreader/cachingreaderchunk.h"
-#include "track/track.h"
 #include "engine/engineworker.h"
 #include "sources/audiosource.h"
+#include "track/track_decl.h"
 #include "util/fifo.h"
 
-
 // POD with trivial ctor/dtor/copy for passing through FIFO
 typedef struct CachingReaderChunkReadRequest {
     CachingReaderChunk* chunk;
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
diff --git a/src/engine/enginebuffer.h b/src/engine/enginebuffer.h
index f51f9a59a3..b689f2787a 100644
--- a/src/engine/enginebuffer.h
+++ b/src/engine/enginebuffer.h
@@ -18,16 +18,17 @@
 #ifndef ENGINEBUFFER_H
 #define ENGINEBUFFER_H
 
-#include <QMutex>
-#include <QAtomicInt>
 #include <gtest/gtest_prod.h>
 
-#include "engine/cachingreader/cachingreader.h"
-#include "preferences/usersettings.h"
+#include <QAtomicInt>
+#include <QMutex>
+
 #include "control/controlvalue.h"
+#include "engine/cachingreader/cachingreader.h"
 #include "engine/engineobject.h"
 #include "engine/sync/syncable.h"
-#include "track/track.h"
+#include "preferences/usersettings.h"
+#include "track/track_decl.h"
 #include "util/rotary.h"
 #include "util/types.h"
 
diff --git a/src/engine/sidechain/enginerecord.cpp b/src/engine/sidechain/enginerecord.cpp
index 879e35517e..d8d39ab188 100644
--- a/src/engine/sidechain/enginerecord.cpp
+++ b/src/engine/sidechain/enginerecord.cpp
@@ -8,13 +8,13 @@
 
 #include "engine/sidechain/enginerecord.h"
 
-#include "preferences/usersettings.h"
 #include "control/controlobject.h"
 #include "control/controlproxy.h"
 #include "encoder/encoder.h"
-
 #include "mixer/playerinfo.h"
+#include "preferences/usersettings.h"
 #include "recording/defs_recording.h"
+#include "track/track.h"
 #include "util/event.h"
 
 const int kMetaDataLifeTimeout = 16;
diff --git a/src/engine/sidechain/enginerecord.h b/src/engine/sidechain/enginerecord.h
index e858f81b9e..4cd94ff86d 100644
--- a/src/engine/sidechain/enginerecord.h
+++ b/src/engine/sidechain/enginerecord.h
@@ -11,11 +11,11 @@
 #include <QDataStream>
 #include <QFile>
 
-#include "preferences/usersettings.h"
-#include "encoder/encodercallback.h"
 #include "encoder/encoder.h"
+#include "encoder/encodercallback.h"
 #include "engine/sidechain/sidechainworker.h"
-#include "track/track.h"
+#include "preferences/usersettings.h"
+#include "track/track_decl.h"
 
 class ConfigKey;
 class ControlProxy;
diff --git a/src/engine/sidechain/shoutconnection.h b/src/engine/sidechain/shoutconnection.h
index 937bd5020c..5147515669 100644
--- a/src/engine/sidechain/shoutconnection.h
+++ b/src/engine/sidechain/shoutconnection.h
@@ -5,25 +5,26 @@
 #define ENGINE_SIDECHAIN_SHOUTCONNECTION_H
 
 #include <engine/sidechain/networkoutputstreamworker.h>
+
 #include <QMessageBox>
 #include <QMutex>
-#include <QWaitCondition>
 #include <QObject>
 #include <QSemaphore>
+#include <QSharedPointer>
 #include <QTextCodec>
 #include <QThread>
 #include <QVector>
-#include <QSharedPointer>
+#include <QWaitCondition>
 
 #include "control/controlobject.h"
 #include "control/controlproxy.h"
-#include "encoder/encodercallback.h"
 #include "encoder/encoder.h"
+#include "encoder/encodercallback.h"
 #include "errordialoghandler.h"
+#include "preferences/broadcastprofile.h"
 #include "preferences/usersettings.h"
-#include "track/track.h"
+#include "track/track_decl.h"
 #include "util/fifo.h"
-#include "preferences/broadcastprofile.h"
 
 // Forward declare libshout structures to prevent leaking shout.h definitions
 // beyond where they are needed.
diff --git a/src/engine/sync/synccontrol.cpp b/src/engine/sync/synccontrol.cpp
index 8c319fac8d..d06b212ee3 100644
--- a/src/engine/sync/synccontrol.cpp
+++ b/src/engine/sync/synccontrol.cpp
@@ -7,6 +7,7 @@
 #include "engine/controls/bpmcontrol.h"
 #include "engine/controls/ratecontrol.h"
 #include "engine/enginebuffer.h"
+#include "track/track.h"
 #include "util/assert.h"
 #include "util/logger.h"
 #include "util/math.h"