summaryrefslogtreecommitdiffstats
path: root/src/mixer
diff options
context:
space:
mode:
authorDaniel Poelzleithner <git@poelzi.org>2020-12-07 12:10:56 +0100
committerDaniel Poelzleithner <git@poelzi.org>2020-12-07 12:10:56 +0100
commite77124c39828cbc120f6bf566db084869a04b42d (patch)
tree46020dafe469eed4f04bf7d8081935ae1338a28d /src/mixer
parentbf343d2677f19d1886682c4bd15e26f70884ce27 (diff)
Slimdown moc_compilation.cpp
The moc_compilation file became unbearable large, easily taking 10 minutes to compile whenever a Q_OBJECT changes. AUTOMOC scans for <basename>_moc.cpp includes and does not add the file to the moc_compilation whenever it is included in the propper cpp file. After this patch, moc_compilation.cpp is empty and the mocs are compiled with the approptial cpp, increasing recompile speeds by a factor of 10 when just a header file changed.
Diffstat (limited to 'src/mixer')
-rw-r--r--src/mixer/auxiliary.cpp3
-rw-r--r--src/mixer/baseplayer.cpp2
-rw-r--r--src/mixer/basetrackplayer.cpp1
-rw-r--r--src/mixer/deck.cpp2
-rw-r--r--src/mixer/microphone.cpp3
-rw-r--r--src/mixer/playerinfo.cpp1
-rw-r--r--src/mixer/playermanager.cpp1
-rw-r--r--src/mixer/previewdeck.cpp2
-rw-r--r--src/mixer/sampler.cpp1
-rw-r--r--src/mixer/samplerbank.cpp1
10 files changed, 15 insertions, 2 deletions
diff --git a/src/mixer/auxiliary.cpp b/src/mixer/auxiliary.cpp
index 2f41044312..7f4e224bb3 100644
--- a/src/mixer/auxiliary.cpp
+++ b/src/mixer/auxiliary.cpp
@@ -1,8 +1,9 @@
#include "mixer/auxiliary.h"
#include "control/controlproxy.h"
-#include "engine/enginemaster.h"
#include "engine/channels/engineaux.h"
+#include "engine/enginemaster.h"
+#include "moc_auxiliary.cpp"
#include "soundio/soundmanager.h"
#include "soundio/soundmanagerutil.h"
diff --git a/src/mixer/baseplayer.cpp b/src/mixer/baseplayer.cpp
index 0b8948b81b..e5dd965f0f 100644
--- a/src/mixer/baseplayer.cpp
+++ b/src/mixer/baseplayer.cpp
@@ -1,5 +1,7 @@
#include "mixer/baseplayer.h"
+#include "moc_baseplayer.cpp"
+
BasePlayer::BasePlayer(QObject* pParent, const QString& group)
: QObject(pParent),
m_group(group) {
diff --git a/src/mixer/basetrackplayer.cpp b/src/mixer/basetrackplayer.cpp
index a8ee1e535c..f8e06869bf 100644
--- a/src/mixer/basetrackplayer.cpp
+++ b/src/mixer/basetrackplayer.cpp
@@ -13,6 +13,7 @@
#include "engine/sync/enginesync.h"
#include "mixer/playerinfo.h"
#include "mixer/playermanager.h"
+#include "moc_basetrackplayer.cpp"
#include "sources/soundsourceproxy.h"
#include "track/beatgrid.h"
#include "track/track.h"
diff --git a/src/mixer/deck.cpp b/src/mixer/deck.cpp
index 121bef0f22..8eafdda5bf 100644
--- a/src/mixer/deck.cpp
+++ b/src/mixer/deck.cpp
@@ -1,5 +1,7 @@
#include "mixer/deck.h"
+#include "moc_deck.cpp"
+
Deck::Deck(QObject* pParent,
UserSettingsPointer pConfig,
EngineMaster* pMixingEngine,
diff --git a/src/mixer/microphone.cpp b/src/mixer/microphone.cpp
index aa3ddcaf67..f08a556dbb 100644
--- a/src/mixer/microphone.cpp
+++ b/src/mixer/microphone.cpp
@@ -1,8 +1,9 @@
#include "mixer/microphone.h"
#include "control/controlproxy.h"
-#include "engine/enginemaster.h"
#include "engine/channels/enginemicrophone.h"
+#include "engine/enginemaster.h"
+#include "moc_microphone.cpp"
#include "soundio/soundmanager.h"
#include "soundio/soundmanagerutil.h"
diff --git a/src/mixer/playerinfo.cpp b/src/mixer/playerinfo.cpp
index f0511d4dfe..ece8eca850 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 "moc_playerinfo.cpp"
#include "track/track.h"
namespace {
diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp
index 382da561e9..cff07d9d90 100644
--- a/src/mixer/playermanager.cpp
+++ b/src/mixer/playermanager.cpp
@@ -16,6 +16,7 @@
#include "mixer/previewdeck.h"
#include "mixer/sampler.h"
#include "mixer/samplerbank.h"
+#include "moc_playermanager.cpp"
#include "preferences/dialog/dlgprefdeck.h"
#include "soundio/soundmanager.h"
#include "track/track.h"
diff --git a/src/mixer/previewdeck.cpp b/src/mixer/previewdeck.cpp
index e5c27bf6aa..82398572c3 100644
--- a/src/mixer/previewdeck.cpp
+++ b/src/mixer/previewdeck.cpp
@@ -1,5 +1,7 @@
#include "mixer/previewdeck.h"
+#include "moc_previewdeck.cpp"
+
PreviewDeck::PreviewDeck(QObject* pParent,
UserSettingsPointer pConfig,
EngineMaster* pMixingEngine,
diff --git a/src/mixer/sampler.cpp b/src/mixer/sampler.cpp
index 92371d0d1a..2fad4ff811 100644
--- a/src/mixer/sampler.cpp
+++ b/src/mixer/sampler.cpp
@@ -1,6 +1,7 @@
#include "mixer/sampler.h"
#include "control/controlobject.h"
+#include "moc_sampler.cpp"
Sampler::Sampler(QObject* pParent,
UserSettingsPointer pConfig,
diff --git a/src/mixer/samplerbank.cpp b/src/mixer/samplerbank.cpp
index 84c6796544..435835e48b 100644
--- a/src/mixer/samplerbank.cpp
+++ b/src/mixer/samplerbank.cpp
@@ -6,6 +6,7 @@
#include "control/controlpushbutton.h"
#include "mixer/playermanager.h"
#include "mixer/sampler.h"
+#include "moc_samplerbank.cpp"
#include "track/track.h"
#include "util/assert.h"