From a9d770bd2c214be727eee466e4f7e7c3c8311e94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 28 Sep 2020 16:57:20 +0200
Subject: replace #include "track/track.h" by "track_decl.h" in all header
 files

---
 src/mixer/basetrackplayer.h | 4 +++-
 src/mixer/playerinfo.cpp    | 1 +
 src/mixer/playerinfo.h      | 6 +++---
 src/mixer/playermanager.h   | 5 +++--
 4 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/mixer')

diff --git a/src/mixer/basetrackplayer.h b/src/mixer/basetrackplayer.h
index d5220ca7da..906a26d428 100644
--- a/src/mixer/basetrackplayer.h
+++ b/src/mixer/basetrackplayer.h
@@ -9,7 +9,9 @@
 #include "engine/channels/enginedeck.h"
 #include "mixer/baseplayer.h"
 #include "preferences/usersettings.h"
-#include "track/track.h"
+#include "track/replaygain.h"
+#include "track/track_decl.h"
+#include "util/color/rgbcolor.h"
 #include "util/memory.h"
 #include "util/parented_ptr.h"
 
diff --git a/src/mixer/playerinfo.cpp b/src/mixer/playerinfo.cpp
index 75e062d716..144caea3ea 100644
--- a/src/mixer/playerinfo.cpp
+++ b/src/mixer/playerinfo.cpp
@@ -22,6 +22,7 @@
 #include "engine/channels/enginechannel.h"
 #include "engine/enginexfader.h"
 #include "mixer/playermanager.h"
+#include "track/track.h"
 
 namespace {
 
diff --git a/src/mixer/playerinfo.h b/src/mixer/playerinfo.h
index 5aee4fc06c..68cef8d636 100644
--- a/src/mixer/playerinfo.h
+++ b/src/mixer/playerinfo.h
@@ -17,13 +17,13 @@
 #ifndef MIXER_PLAYERINFO_H
 #define MIXER_PLAYERINFO_H
 
-#include <QObject>
-#include <QMutex>
 #include <QMap>
+#include <QMutex>
+#include <QObject>
 #include <QTimerEvent>
 
 #include "control/controlproxy.h"
-#include "track/track.h"
+#include "track/track_decl.h"
 
 class PlayerInfo : public QObject {
     Q_OBJECT
diff --git a/src/mixer/playermanager.h b/src/mixer/playermanager.h
index 369cc73f0d..a0b14689ee 100644
--- a/src/mixer/playermanager.h
+++ b/src/mixer/playermanager.h
@@ -4,14 +4,14 @@
 #ifndef MIXER_PLAYERMANAGER_H
 #define MIXER_PLAYERMANAGER_H
 
-#include <QObject>
 #include <QList>
 #include <QMap>
 #include <QMutex>
+#include <QObject>
 
 #include "analyzer/trackanalysisscheduler.h"
 #include "preferences/usersettings.h"
-#include "track/track.h"
+#include "track/track_decl.h"
 #include "util/parented_ptr.h"
 #include "util/performancetimer.h"
 
@@ -28,6 +28,7 @@ class Sampler;
 class SamplerBank;
 class SoundManager;
 class VisualsManager;
+class ControlProxy;
 
 // For mocking PlayerManager.
 class PlayerManagerInterface {
-- 
cgit v1.2.3