diff options
Diffstat (limited to 'src/engine')
42 files changed, 91 insertions, 34 deletions
diff --git a/src/engine/bufferscalers/enginebufferscale.cpp b/src/engine/bufferscalers/enginebufferscale.cpp index 028c30a3d4..563e5d530d 100644 --- a/src/engine/bufferscalers/enginebufferscale.cpp +++ b/src/engine/bufferscalers/enginebufferscale.cpp @@ -1,6 +1,7 @@ #include "engine/bufferscalers/enginebufferscale.h" #include "engine/engine.h" +#include "moc_enginebufferscale.cpp" #include "util/defs.h" EngineBufferScale::EngineBufferScale() diff --git a/src/engine/bufferscalers/enginebufferscalerubberband.cpp b/src/engine/bufferscalers/enginebufferscalerubberband.cpp index fd100a6c14..e1b5f02542 100644 --- a/src/engine/bufferscalers/enginebufferscalerubberband.cpp +++ b/src/engine/bufferscalers/enginebufferscalerubberband.cpp @@ -6,6 +6,7 @@ #include "control/controlobject.h" #include "engine/readaheadmanager.h" +#include "moc_enginebufferscalerubberband.cpp" #include "track/keyutils.h" #include "util/counter.h" #include "util/defs.h" diff --git a/src/engine/bufferscalers/enginebufferscalest.cpp b/src/engine/bufferscalers/enginebufferscalest.cpp index 88ed71f338..f23aa4b936 100644 --- a/src/engine/bufferscalers/enginebufferscalest.cpp +++ b/src/engine/bufferscalers/enginebufferscalest.cpp @@ -1,5 +1,7 @@ #include "engine/bufferscalers/enginebufferscalest.h" +#include "moc_enginebufferscalest.cpp" + // Fixes redefinition warnings from SoundTouch. #include <soundtouch/SoundTouch.h> diff --git a/src/engine/cachingreader/cachingreader.cpp b/src/engine/cachingreader/cachingreader.cpp index 592371a686..7399e66549 100644 --- a/src/engine/cachingreader/cachingreader.cpp +++ b/src/engine/cachingreader/cachingreader.cpp @@ -1,16 +1,17 @@ -#include <QtDebug> +#include "engine/cachingreader/cachingreader.h" + #include <QFileInfo> +#include <QtDebug> -#include "engine/cachingreader/cachingreader.h" #include "control/controlobject.h" +#include "moc_cachingreader.cpp" #include "track/track.h" #include "util/assert.h" +#include "util/compatibility.h" #include "util/counter.h" +#include "util/logger.h" #include "util/math.h" #include "util/sample.h" -#include "util/logger.h" -#include "util/compatibility.h" - namespace { diff --git a/src/engine/cachingreader/cachingreaderworker.cpp b/src/engine/cachingreader/cachingreaderworker.cpp index aefd482d04..5353b7b105 100644 --- a/src/engine/cachingreader/cachingreaderworker.cpp +++ b/src/engine/cachingreader/cachingreaderworker.cpp @@ -5,6 +5,7 @@ #include <QtDebug> #include "control/controlobject.h" +#include "moc_cachingreaderworker.cpp" #include "sources/soundsourceproxy.h" #include "track/track.h" #include "util/compatibility.h" diff --git a/src/engine/channels/engineaux.cpp b/src/engine/channels/engineaux.cpp index ecba74bc13..098d7eff2f 100644 --- a/src/engine/channels/engineaux.cpp +++ b/src/engine/channels/engineaux.cpp @@ -3,10 +3,11 @@ #include <QtDebug> #include "control/control.h" -#include "preferences/usersettings.h" #include "control/controlaudiotaperpot.h" #include "effects/effectsmanager.h" #include "engine/effects/engineeffectsmanager.h" +#include "moc_engineaux.cpp" +#include "preferences/usersettings.h" #include "util/sample.h" EngineAux::EngineAux(const ChannelHandleAndGroup& handle_group, EffectsManager* pEffectsManager) diff --git a/src/engine/channels/enginechannel.cpp b/src/engine/channels/enginechannel.cpp index 64a7a30971..161f292811 100644 --- a/src/engine/channels/enginechannel.cpp +++ b/src/engine/channels/enginechannel.cpp @@ -2,6 +2,7 @@ #include "control/controlobject.h" #include "control/controlpushbutton.h" +#include "moc_enginechannel.cpp" EngineChannel::EngineChannel(const ChannelHandleAndGroup& handle_group, EngineChannel::ChannelOrientation defaultOrientation, diff --git a/src/engine/channels/enginedeck.cpp b/src/engine/channels/enginedeck.cpp index 8eeb3d1bad..670d3b46f6 100644 --- a/src/engine/channels/enginedeck.cpp +++ b/src/engine/channels/enginedeck.cpp @@ -23,6 +23,7 @@ #include "engine/enginebuffer.h" #include "engine/enginepregain.h" #include "engine/enginevumeter.h" +#include "moc_enginedeck.cpp" #include "util/sample.h" #include "waveform/waveformwidgetfactory.h" diff --git a/src/engine/channels/enginemicrophone.cpp b/src/engine/channels/enginemicrophone.cpp index 884c5633d1..a6732417b7 100644 --- a/src/engine/channels/enginemicrophone.cpp +++ b/src/engine/channels/enginemicrophone.cpp @@ -2,11 +2,12 @@ #include <QtDebug> -#include "preferences/usersettings.h" #include "control/control.h" #include "control/controlaudiotaperpot.h" #include "effects/effectsmanager.h" #include "engine/effects/engineeffectsmanager.h" +#include "moc_enginemicrophone.cpp" +#include "preferences/usersettings.h" #include "util/sample.h" EngineMicrophone::EngineMicrophone(const ChannelHandleAndGroup& handle_group, diff --git a/src/engine/controls/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp index 52370da16d..98202c30d6 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 "moc_bpmcontrol.cpp" #include "track/track.h" #include "util/assert.h" #include "util/duration.h" diff --git a/src/engine/controls/clockcontrol.cpp b/src/engine/controls/clockcontrol.cpp index f48660bb4c..22cd4707bc 100644 --- a/src/engine/controls/clockcontrol.cpp +++ b/src/engine/controls/clockcontrol.cpp @@ -3,6 +3,7 @@ #include "control/controlobject.h" #include "control/controlproxy.h" #include "engine/controls/enginecontrol.h" +#include "moc_clockcontrol.cpp" #include "preferences/usersettings.h" #include "track/track.h" diff --git a/src/engine/controls/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp index f8ac0c8e20..1def96cc28 100644 --- a/src/engine/controls/cuecontrol.cpp +++ b/src/engine/controls/cuecontrol.cpp @@ -6,6 +6,7 @@ #include "control/controlobject.h" #include "control/controlpushbutton.h" #include "engine/enginebuffer.h" +#include "moc_cuecontrol.cpp" #include "preferences/colorpalettesettings.h" #include "track/track.h" #include "util/color/color.h" diff --git a/src/engine/controls/enginecontrol.cpp b/src/engine/controls/enginecontrol.cpp index fcc0ff712c..f87fb7b0e0 100644 --- a/src/engine/controls/enginecontrol.cpp +++ b/src/engine/controls/enginecontrol.cpp @@ -1,8 +1,10 @@ #include "engine/controls/enginecontrol.h" -#include "engine/enginemaster.h" + #include "engine/enginebuffer.h" +#include "engine/enginemaster.h" #include "engine/sync/enginesync.h" #include "mixer/playermanager.h" +#include "moc_enginecontrol.cpp" EngineControl::EngineControl(const QString& group, UserSettingsPointer pConfig) diff --git a/src/engine/controls/keycontrol.cpp b/src/engine/controls/keycontrol.cpp index 8fac74c1fd..874cdf5cb5 100644 --- a/src/engine/controls/keycontrol.cpp +++ b/src/engine/controls/keycontrol.cpp @@ -8,6 +8,7 @@ #include "control/controlproxy.h" #include "control/controlpushbutton.h" #include "engine/enginebuffer.h" +#include "moc_keycontrol.cpp" #include "track/keyutils.h" //static const double kLockOriginalKey = 0; diff --git a/src/engine/controls/loopingcontrol.cpp b/src/engine/controls/loopingcontrol.cpp index b0a1b267b3..833dbdf329 100644 --- a/src/engine/controls/loopingcontrol.cpp +++ b/src/engine/controls/loopingcontrol.cpp @@ -1,16 +1,18 @@ +#include "engine/controls/loopingcontrol.h" + #include <QtDebug> #include "control/controlobject.h" #include "control/controlpushbutton.h" #include "engine/controls/bpmcontrol.h" #include "engine/controls/enginecontrol.h" -#include "engine/controls/loopingcontrol.h" #include "engine/enginebuffer.h" +#include "moc_loopingcontrol.cpp" #include "preferences/usersettings.h" +#include "track/track.h" #include "util/compatibility.h" #include "util/math.h" #include "util/sample.h" -#include "track/track.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/quantizecontrol.cpp b/src/engine/controls/quantizecontrol.cpp index 52665fac3a..c059bca51c 100644 --- a/src/engine/controls/quantizecontrol.cpp +++ b/src/engine/controls/quantizecontrol.cpp @@ -5,6 +5,7 @@ #include "control/controlobject.h" #include "control/controlpushbutton.h" #include "engine/controls/enginecontrol.h" +#include "moc_quantizecontrol.cpp" #include "preferences/usersettings.h" #include "track/track.h" diff --git a/src/engine/controls/ratecontrol.cpp b/src/engine/controls/ratecontrol.cpp index 1998e8a9cf..f2c4465dfe 100644 --- a/src/engine/controls/ratecontrol.cpp +++ b/src/engine/controls/ratecontrol.cpp @@ -1,18 +1,19 @@ +#include "engine/controls/ratecontrol.h" + +#include <QtDebug> + #include "control/controlobject.h" -#include "control/controlpushbutton.h" #include "control/controlpotmeter.h" -#include "control/controlttrotary.h" #include "control/controlproxy.h" -#include "util/rotary.h" -#include "util/math.h" -#include "vinylcontrol/defs_vinylcontrol.h" - +#include "control/controlpushbutton.h" +#include "control/controlttrotary.h" #include "engine/controls/bpmcontrol.h" #include "engine/controls/enginecontrol.h" -#include "engine/controls/ratecontrol.h" #include "engine/positionscratchcontroller.h" - -#include <QtDebug> +#include "moc_ratecontrol.cpp" +#include "util/math.h" +#include "util/rotary.h" +#include "vinylcontrol/defs_vinylcontrol.h" namespace { constexpr int kRateSensitivityMin = 100; diff --git a/src/engine/controls/vinylcontrolcontrol.cpp b/src/engine/controls/vinylcontrolcontrol.cpp index 951552d44a..0684d4ea41 100644 --- a/src/engine/controls/vinylcontrolcontrol.cpp +++ b/src/engine/controls/vinylcontrolcontrol.cpp @@ -1,5 +1,6 @@ #include "engine/controls/vinylcontrolcontrol.h" +#include "moc_vinylcontrolcontrol.cpp" #include "track/track.h" #include "util/math.h" #include "vinylcontrol/vinylcontrol.h" diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp index 36be2816b5..49392829f1 100644 --- a/src/engine/enginebuffer.cpp +++ b/src/engine/enginebuffer.cpp @@ -26,6 +26,7 @@ #include "engine/readaheadmanager.h" #include "engine/sync/enginesync.h" #include "engine/sync/synccontrol.h" +#include "moc_enginebuffer.cpp" #include "preferences/usersettings.h" #include "track/beatfactory.h" #include "track/keyutils.h" diff --git a/src/engine/enginedelay.cpp b/src/engine/enginedelay.cpp index 5afef445f0..aaaafbd431 100644 --- a/src/engine/enginedelay.cpp +++ b/src/engine/enginedelay.cpp @@ -1,8 +1,9 @@ #include "enginedelay.h" -#include "control/controlproxy.h" #include "control/controlpotmeter.h" +#include "control/controlproxy.h" #include "engine/engine.h" +#include "moc_enginedelay.cpp" #include "util/assert.h" #include "util/sample.h" diff --git a/src/engine/enginemaster.cpp b/src/engine/enginemaster.cpp index 9e49dc18de..79b99636a5 100644 --- a/src/engine/enginemaster.cpp +++ b/src/engine/enginemaster.cpp @@ -1,21 +1,18 @@ #include "engine/enginemaster.h" -#include <QtDebug> #include <QList> #include <QPair> +#include <QtDebug> -#include "preferences/usersettings.h" -#include "control/controlaudiotaperpot.h" #include "control/controlaudiotaperpot.h" #include "control/controlpotmeter.h" #include "control/controlpushbutton.h" #include "effects/effectsmanager.h" #include "engine/channelmixer.h" -#include "engine/effects/engineeffectsmanager.h" -#include "engine/enginebuffer.h" -#include "engine/enginebuffer.h" #include "engine/channels/enginechannel.h" #include "engine/channels/enginedeck.h" +#include "engine/effects/engineeffectsmanager.h" +#include "engine/enginebuffer.h" #include "engine/enginedelay.h" #include "engine/enginetalkoverducking.h" #include "engine/enginevumeter.h" @@ -24,6 +21,8 @@ #include "engine/sidechain/enginesidechain.h" #include "engine/sync/enginesync.h" #include "mixer/playermanager.h" +#include "moc_enginemaster.cpp" +#include "preferences/usersettings.h" #include "util/defs.h" #include "util/sample.h" #include "util/timer.h" diff --git a/src/engine/engineobject.cpp b/src/engine/engineobject.cpp index 25f880f179..43cd0987aa 100644 --- a/src/engine/engineobject.cpp +++ b/src/engine/engineobject.cpp @@ -1,5 +1,7 @@ #include "engineobject.h" +#include "moc_engineobject.cpp" + EngineObject::EngineObject() { } diff --git a/src/engine/enginetalkoverducking.cpp b/src/engine/enginetalkoverducking.cpp index d6f41ebea9..e4e6f9f5f0 100644 --- a/src/engine/enginetalkoverducking.cpp +++ b/src/engine/enginetalkoverducking.cpp @@ -1,6 +1,8 @@ -#include "control/controlproxy.h" #include "engine/enginetalkoverducking.h" +#include "control/controlproxy.h" +#include "moc_enginetalkoverducking.cpp" + namespace { constexpr CSAMPLE kDuckThreshold = 0.1f; diff --git a/src/engine/enginetalkoverducking.h b/src/engine/enginetalkoverducking.h index 090b683af8..584cca291d 100644 --- a/src/engine/enginetalkoverducking.h +++ b/src/engine/enginetalkoverducking.h @@ -1,3 +1,5 @@ +#pragma once + #include "engine/enginesidechaincompressor.h" #include "control/controlpotmeter.h" #include "control/controlpushbutton.h" diff --git a/src/engine/enginevumeter.cpp b/src/engine/enginevumeter.cpp index 666ea72f5d..07c761ff09 100644 --- a/src/engine/enginevumeter.cpp +++ b/src/engine/enginevumeter.cpp @@ -1,7 +1,8 @@ #include "engine/enginevumeter.h" -#include "control/controlproxy.h" #include "control/controlpotmeter.h" +#include "control/controlproxy.h" +#include "moc_enginevumeter.cpp" #include "util/math.h" #include "util/sample.h" diff --git a/src/engine/engineworker.cpp b/src/engine/engineworker.cpp index 3bfe1e5ad3..228a574ebb 100644 --- a/src/engine/engineworker.cpp +++ b/src/engine/engineworker.cpp @@ -1,5 +1,7 @@ #include "engine/engineworker.h" + #include "engine/engineworkerscheduler.h" +#include "moc_engineworker.cpp" EngineWorker::EngineWorker() : m_pScheduler(nullptr) { diff --git a/src/engine/engineworkerscheduler.cpp b/src/engine/engineworkerscheduler.cpp index 6537921e23..9f3a3ad7f6 100644 --- a/src/engine/engineworkerscheduler.cpp +++ b/src/engine/engineworkerscheduler.cpp @@ -1,7 +1,9 @@ +#include "engine/engineworkerscheduler.h" + #include <QtDebug> #include "engine/engineworker.h" -#include "engine/engineworkerscheduler.h" +#include "moc_engineworkerscheduler.cpp" #include "util/event.h" EngineWorkerScheduler::EngineWorkerScheduler(QObject* pParent) diff --git a/src/engine/filters/enginefilter.cpp b/src/engine/filters/enginefilter.cpp index 854a53fa10..b299f04772 100644 --- a/src/engine/filters/enginefilter.cpp +++ b/src/engine/filters/enginefilter.cpp @@ -1,8 +1,10 @@ // Wrapper for FidLib Filter Library #include "engine/filters/enginefilter.h" + #include <QtDebug> +#include "moc_enginefilter.cpp" EngineFilter::EngineFilter(char * conf, int predefinedType) : iir(0), diff --git a/src/engine/filters/enginefilterbessel4.cpp b/src/engine/filters/enginefilterbessel4.cpp index a47c9a46c3..8b559090a0 100644 --- a/src/engine/filters/enginefilterbessel4.cpp +++ b/src/engine/filters/enginefilterbessel4.cpp @@ -1,4 +1,6 @@ #include "engine/filters/enginefilterbessel4.h" + +#include "moc_enginefilterbessel4.cpp" #include "util/math.h" namespace { diff --git a/src/engine/filters/enginefilterbessel8.cpp b/src/engine/filters/enginefilterbessel8.cpp index fa97b01fc7..9a5900d8f4 100644 --- a/src/engine/filters/enginefilterbessel8.cpp +++ b/src/engine/filters/enginefilterbessel8.cpp @@ -1,4 +1,6 @@ #include "engine/filters/enginefilterbessel8.h" + +#include "moc_enginefilterbessel8.cpp" #include "util/math.h" namespace { diff --git a/src/engine/filters/enginefilterbiquad1.cpp b/src/engine/filters/enginefilterbiquad1.cpp index ee9572befb..c0376bc9c6 100644 --- a/src/engine/filters/enginefilterbiquad1.cpp +++ b/src/engine/filters/enginefilterbiquad1.cpp @@ -1,6 +1,9 @@ -#include <stdio.h> #include "engine/filters/enginefilterbiquad1.h" +#include <stdio.h> + +#include "moc_enginefilterbiquad1.cpp" + EngineFilterBiquad1LowShelving::EngineFilterBiquad1LowShelving(int sampleRate, double centerFreq, double Q) { diff --git a/src/engine/filters/enginefilterbutterworth4.cpp b/src/engine/filters/enginefilterbutterworth4.cpp index 6abe565b19..4d97777aa2 100644 --- a/src/engine/filters/enginefilterbutterworth4.cpp +++ b/src/engine/filters/enginefilterbutterworth4.cpp @@ -1,5 +1,7 @@ #include "engine/filters/enginefilterbutterworth4.h" +#include "moc_enginefilterbutterworth4.cpp" + namespace { constexpr char kFidSpecLowPassButterworth4[] = "LpBu4"; constexpr char kFidSpecBandPassButterworth4[] = "BpBu4"; diff --git a/src/engine/filters/enginefilterbutterworth8.cpp b/src/engine/filters/enginefilterbutterworth8.cpp index ea5a134b4a..00e503af00 100644 --- a/src/engine/filters/enginefilterbutterworth8.cpp +++ b/src/engine/filters/enginefilterbutterworth8.cpp @@ -1,5 +1,7 @@ #include "engine/filters/enginefilterbutterworth8.h" +#include "moc_enginefilterbutterworth8.cpp" + namespace { constexpr char kFidSpecLowPassButterworth8[] = "LpBu8"; constexpr char kFidSpecBandPassButterworth8[] = "BpBu8"; diff --git a/src/engine/filters/enginefilterlinkwitzriley2.cpp b/src/engine/filters/enginefilterlinkwitzriley2.cpp index 44527f454b..ef5704ef4b 100644 --- a/src/engine/filters/enginefilterlinkwitzriley2.cpp +++ b/src/engine/filters/enginefilterlinkwitzriley2.cpp @@ -1,5 +1,7 @@ #include "engine/filters/enginefilterlinkwitzriley2.h" +#include "moc_enginefilterlinkwitzriley2.cpp" + namespace { constexpr char kFidSpecLowPassButterworth1[] = "LpBu1"; constexpr char kFidSpecHighPassButterworth1[] = "HpBu1"; diff --git a/src/engine/filters/enginefilterlinkwitzriley4.cpp b/src/engine/filters/enginefilterlinkwitzriley4.cpp index 378314c1b7..3fec25a068 100644 --- a/src/engine/filters/enginefilterlinkwitzriley4.cpp +++ b/src/engine/filters/enginefilterlinkwitzriley4.cpp @@ -1,5 +1,7 @@ #include "engine/filters/enginefilterlinkwitzriley4.h" +#include "moc_enginefilterlinkwitzriley4.cpp" + namespace { constexpr char kFidSpecLowPassButterworth2[] = "LpBu2"; constexpr char kFidSpecHighPassButterworth2[] = "HpBu2"; diff --git a/src/engine/filters/enginefilterlinkwitzriley8.cpp b/src/engine/filters/enginefilterlinkwitzriley8.cpp index 775460590f..c59b7e526f 100644 --- a/src/engine/filters/enginefilterlinkwitzriley8.cpp +++ b/src/engine/filters/enginefilterlinkwitzriley8.cpp @@ -1,5 +1,7 @@ #include "engine/filters/enginefilterlinkwitzriley8.h" +#include "moc_enginefilterlinkwitzriley8.cpp" + namespace { constexpr char kFidSpecLowPassButterworth4[] = "LpBu4"; constexpr char kFidSpecHighPassButterworth4[] = "HpBu4"; diff --git a/src/engine/filters/enginefiltermoogladder4.cpp b/src/engine/filters/enginefiltermoogladder4.cpp index 008360229a..dd71f71c0d 100644 --- a/src/engine/filters/enginefiltermoogladder4.cpp +++ b/src/engine/filters/enginefiltermoogladder4.cpp @@ -1,5 +1,6 @@ #include "engine/filters/enginefiltermoogladder4.h" +#include "moc_enginefiltermoogladder4.cpp" EngineFilterMoogLadder4Low::EngineFilterMoogLadder4Low(int sampleRate, double freqCorner1, diff --git a/src/engine/sidechain/enginerecord.cpp b/src/engine/sidechain/enginerecord.cpp index 1dfcd9ddee..8ae573261a 100644 --- a/src/engine/sidechain/enginerecord.cpp +++ b/src/engine/sidechain/enginerecord.cpp @@ -4,6 +4,7 @@ #include "control/controlproxy.h" #include "encoder/encoder.h" #include "mixer/playerinfo.h" +#include "moc_enginerecord.cpp" #include "preferences/usersettings.h" #include "recording/defs_recording.h" #include "track/track.h" diff --git a/src/engine/sidechain/enginesidechain.cpp b/src/engine/sidechain/enginesidechain.cpp index 412d0864e2..447908b991 100644 --- a/src/engine/sidechain/enginesidechain.cpp +++ b/src/engine/sidechain/enginesidechain.cpp @@ -8,11 +8,12 @@ #include "engine/sidechain/enginesidechain.h" -#include <QtDebug> #include <QMutexLocker> +#include <QtDebug> |