summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/engine/channels/engineaux.cpp3
-rw-r--r--src/engine/channels/enginechannel.cpp7
-rw-r--r--src/engine/channels/enginechannel.h12
-rw-r--r--src/engine/channels/enginedeck.cpp13
-rw-r--r--src/engine/channels/enginedeck.h5
-rw-r--r--src/engine/channels/enginemicrophone.cpp5
-rw-r--r--src/engine/controls/bpmcontrol.cpp14
-rw-r--r--src/engine/enginebuffer.cpp17
-rw-r--r--src/engine/sync/enginesync.cpp18
-rw-r--r--src/engine/sync/synccontrol.cpp6
-rw-r--r--src/mixer/basetrackplayer.cpp21
-rw-r--r--src/mixer/basetrackplayer.h18
-rw-r--r--src/mixer/deck.cpp18
-rw-r--r--src/mixer/playermanager.cpp8
-rw-r--r--src/mixer/previewdeck.cpp18
-rw-r--r--src/mixer/sampler.cpp18
-rw-r--r--src/test/enginemastertest.cpp7
-rw-r--r--src/test/enginesynctest.cpp6
-rw-r--r--src/vinylcontrol/vinylcontrolmanager.h4
19 files changed, 106 insertions, 112 deletions
diff --git a/src/engine/channels/engineaux.cpp b/src/engine/channels/engineaux.cpp
index 8303ddfffa..b54f198312 100644
--- a/src/engine/channels/engineaux.cpp
+++ b/src/engine/channels/engineaux.cpp
@@ -15,7 +15,8 @@
EngineAux::EngineAux(const ChannelHandleAndGroup& handle_group, EffectsManager* pEffectsManager)
: EngineChannel(handle_group, EngineChannel::CENTER, pEffectsManager,
- /*isTalkoverChannel*/ false, /*isPrimaryDeck*/ false),
+ /*isTalkoverChannel*/ false,
+ /*isPrimaryDeck*/ false),
m_pInputConfigured(new ControlObject(ConfigKey(getGroup(), "input_configured"))),
m_pPregain(new ControlAudioTaperPot(ConfigKey(getGroup(), "pregain"), -12, 12, 0.5)),
m_wasActive(false) {
diff --git a/src/engine/channels/enginechannel.cpp b/src/engine/channels/enginechannel.cpp
index 84d600889a..351982beb9 100644
--- a/src/engine/channels/enginechannel.cpp
+++ b/src/engine/channels/enginechannel.cpp
@@ -21,9 +21,10 @@
#include "control/controlpushbutton.h"
EngineChannel::EngineChannel(const ChannelHandleAndGroup& handle_group,
- EngineChannel::ChannelOrientation defaultOrientation,
- EffectsManager* pEffectsManager, bool isTalkoverChannel,
- bool isPrimaryDeck)
+ EngineChannel::ChannelOrientation defaultOrientation,
+ EffectsManager* pEffectsManager,
+ bool isTalkoverChannel,
+ bool isPrimaryDeck)
: m_group(handle_group),
m_pEffectsManager(pEffectsManager),
m_vuMeter(getGroup()),
diff --git a/src/engine/channels/enginechannel.h b/src/engine/channels/enginechannel.h
index 76b6ac6022..c11edcf5bd 100644
--- a/src/engine/channels/enginechannel.h
+++ b/src/engine/channels/enginechannel.h
@@ -40,10 +40,10 @@ class EngineChannel : public EngineObject {
};
EngineChannel(const ChannelHandleAndGroup& handle_group,
- ChannelOrientation defaultOrientation,
- EffectsManager* pEffectsManager,
- bool isTalkoverChannel,
- bool isPrimaryDeck);
+ ChannelOrientation defaultOrientation,
+ EffectsManager* pEffectsManager,
+ bool isTalkoverChannel,
+ bool isPrimaryDeck);
virtual ~EngineChannel();
virtual ChannelOrientation getOrientation() const;
@@ -64,7 +64,9 @@ class EngineChannel : public EngineObject {
void setTalkover(bool enabled);
virtual bool isTalkoverEnabled() const;
inline bool isTalkoverChannel() { return m_bIsTalkoverChannel; };
- inline bool isPrimaryDeck() { return m_bIsPrimaryDeck; };
+ inline bool isPrimaryDeck() {
+ return m_bIsPrimaryDeck;
+ };
virtual void process(CSAMPLE* pOut, const int iBufferSize) = 0;
virtual void collectFeatures(GroupFeatureState* pGroupFeatures) const = 0;
diff --git a/src/engine/channels/enginedeck.cpp b/src/engine/channels/enginedeck.cpp
index 0f69fed027..bce7fddbd4 100644
--- a/src/engine/channels/enginedeck.cpp
+++ b/src/engine/channels/enginedeck.cpp
@@ -27,13 +27,14 @@
#include "waveform/waveformwidgetfactory.h"
EngineDeck::EngineDeck(const ChannelHandleAndGroup& handle_group,
- UserSettingsPointer pConfig,
- EngineMaster* pMixingEngine,
- EffectsManager* pEffectsManager,
- EngineChannel::ChannelOrientation defaultOrientation,
- bool primaryDeck)
+ UserSettingsPointer pConfig,
+ EngineMaster* pMixingEngine,
+ EffectsManager* pEffectsManager,
+ EngineChannel::ChannelOrientation defaultOrientation,
+ bool primaryDeck)
: EngineChannel(handle_group, defaultOrientation, pEffectsManager,
- /*isTalkoverChannel*/ false, primaryDeck),
+ /*isTalkoverChannel*/ false,
+ primaryDeck),
m_pConfig(pConfig),
m_pInputConfigured(new ControlObject(ConfigKey(getGroup(), "input_configured"))),
m_pPassing(new ControlPushButton(ConfigKey(getGroup(), "passthrough"))),
diff --git a/src/engine/channels/enginedeck.h b/src/engine/channels/enginedeck.h
index 869b095e1d..a82c000ac2 100644
--- a/src/engine/channels/enginedeck.h
+++ b/src/engine/channels/enginedeck.h
@@ -40,10 +40,7 @@ class ControlPushButton;
class EngineDeck : public EngineChannel, public AudioDestination {
Q_OBJECT
public:
- EngineDeck(const ChannelHandleAndGroup& handle_group, UserSettingsPointer pConfig,
- EngineMaster* pMixingEngine, EffectsManager* pEffectsManager,
- EngineChannel::ChannelOrientation defaultOrientation,
- bool primaryDeck);
+ EngineDeck(const ChannelHandleAndGroup& handle_group, UserSettingsPointer pConfig, EngineMaster* pMixingEngine, EffectsManager* pEffectsManager, EngineChannel::ChannelOrientation defaultOrientation, bool primaryDeck);
virtual ~EngineDeck();
virtual void process(CSAMPLE* pOutput, const int iBufferSize);
diff --git a/src/engine/channels/enginemicrophone.cpp b/src/engine/channels/enginemicrophone.cpp
index 7863e9d6bf..ddc78fa882 100644
--- a/src/engine/channels/enginemicrophone.cpp
+++ b/src/engine/channels/enginemicrophone.cpp
@@ -13,9 +13,10 @@
#include "util/sample.h"
EngineMicrophone::EngineMicrophone(const ChannelHandleAndGroup& handle_group,
- EffectsManager* pEffectsManager)
+ EffectsManager* pEffectsManager)
: EngineChannel(handle_group, EngineChannel::CENTER, pEffectsManager,
- /*isTalkoverChannel*/ true, /*isPrimaryDeck*/ false),
+ /*isTalkoverChannel*/ true,
+ /*isPrimaryDeck*/ false),
m_pInputConfigured(new ControlObject(ConfigKey(getGroup(), "input_configured"))),
m_pPregain(new ControlAudioTaperPot(ConfigKey(getGroup(), "pregain"), -12, 12, 0.5)),
m_wasActive(false) {
diff --git a/src/engine/controls/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp
index 6fdb00d7eb..e0cefacb12 100644
--- a/src/engine/controls/bpmcontrol.cpp
+++ b/src/engine/controls/bpmcontrol.cpp
@@ -1,19 +1,19 @@
+#include "engine/controls/bpmcontrol.h"
+
#include <QStringList>
+#include "control/controllinpotmeter.h"
#include "control/controlobject.h"
+#include "control/controlproxy.h"
#include "control/controlpushbutton.h"
-#include "control/controllinpotmeter.h"
-
-#include "engine/enginebuffer.h"
-#include "engine/controls/bpmcontrol.h"
-#include "waveform/visualplayposition.h"
#include "engine/channels/enginechannel.h"
+#include "engine/enginebuffer.h"
#include "engine/enginemaster.h"
-#include "control/controlproxy.h"
#include "util/assert.h"
+#include "util/duration.h"
#include "util/logger.h"
#include "util/math.h"
-#include "util/duration.h"
+#include "waveform/visualplayposition.h"
namespace {
const mixxx::Logger kLogger("BpmControl");
diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp
index 9e0e51563b..2e532d325e 100644
--- a/src/engine/enginebuffer.cpp
+++ b/src/engine/enginebuffer.cpp
@@ -1,16 +1,18 @@
#include "engine/enginebuffer.h"
-#include <cfloat>
-
#include <QtDebug>
+#include <cfloat>
-#include "engine/cachingreader/cachingreader.h"
-#include "preferences/usersettings.h"
#include "control/controlindicator.h"
#include "control/controllinpotmeter.h"
-#include "control/controlproxy.h"
#include "control/controlpotmeter.h"
+#include "control/controlproxy.h"
#include "control/controlpushbutton.h"
+#include "engine/bufferscalers/enginebufferscalelinear.h"
+#include "engine/bufferscalers/enginebufferscalerubberband.h"
+#include "engine/bufferscalers/enginebufferscalest.h"
+#include "engine/cachingreader/cachingreader.h"
+#include "engine/channels/enginechannel.h"
#include "engine/controls/bpmcontrol.h"
#include "engine/controls/clockcontrol.h"
#include "engine/controls/cuecontrol.h"
@@ -19,15 +21,12 @@
#include "engine/controls/loopingcontrol.h"
#include "engine/controls/quantizecontrol.h"
#include "engine/controls/ratecontrol.h"
-#include "engine/bufferscalers/enginebufferscalelinear.h"
-#include "engine/bufferscalers/enginebufferscalerubberband.h"
-#include "engine/bufferscalers/enginebufferscalest.h"
-#include "engine/channels/enginechannel.h"
#include "engine/enginemaster.h"
#include "engine/engineworkerscheduler.h"
#include "engine/readaheadmanager.h"
#include "engine/sync/enginesync.h"
#include "engine/sync/synccontrol.h"
+#include "preferences/usersettings.h"
#include "track/beatfactory.h"
#include "track/keyutils.h"
#include "track/track.h"
diff --git a/src/engine/sync/enginesync.cpp b/src/engine/sync/enginesync.cpp
index 9f27d1063c..d109369e00 100644
--- a/src/engine/sync/enginesync.cpp
+++ b/src/engine/sync/enginesync.cpp
@@ -20,8 +20,8 @@
#include <QStringList>
-#include "engine/enginebuffer.h"
#include "engine/channels/enginechannel.h"
+#include "engine/enginebuffer.h"
#include "engine/sync/internalclock.h"
#include "util/assert.h"
#include "util/defs.h"
@@ -29,7 +29,7 @@
namespace {
const mixxx::Logger kLogger("EngineSync");
-} // namespace
+} // namespace
EngineSync::EngineSync(UserSettingsPointer pConfig)
: BaseSyncableListener(pConfig) {
@@ -53,7 +53,7 @@ Syncable* EngineSync::pickMaster(Syncable* enabling_syncable) {
}
}
- for (const auto& pSyncable: m_syncables) {
+ for (const auto& pSyncable : m_syncables) {
if (pSyncable == enabling_syncable) {
continue;
}
@@ -155,7 +155,7 @@ Syncable* EngineSync::findBpmMatchTarget(Syncable* requester) {
Syncable* stoppedTarget = nullptr;
bool foundTargetBpm = false;
- for (const auto& pOtherSyncable: m_syncables) {
+ for (const auto& pOtherSyncable : m_syncables) {
if (pOtherSyncable == requester) {
continue;
}
@@ -232,8 +232,7 @@ void EngineSync::requestEnableSync(Syncable* pSyncable, bool bEnabled) {
if (newMaster != nullptr && newMaster != m_pMasterSyncable) {
activateMaster(newMaster);
if (targetSyncable == nullptr) {
- setMasterParams(newMaster, newMaster->getBeatDistance(), newMaster->getBaseBpm(),
- newMaster->getBpm());
+ setMasterParams(newMaster, newMaster->getBeatDistance(), newMaster->getBaseBpm(), newMaster->getBpm());
}
}
@@ -243,8 +242,7 @@ void EngineSync::requestEnableSync(Syncable* pSyncable, bool bEnabled) {
}
if (targetSyncable != nullptr) {
- setMasterParams(targetSyncable, targetSyncable->getBeatDistance(),
- targetSyncable->getBaseBpm(), targetSyncable->getBpm());
+ setMasterParams(targetSyncable, targetSyncable->getBeatDistance(), targetSyncable->getBaseBpm(), targetSyncable->getBpm());
if (targetSyncable != pSyncable) {
pSyncable->requestSync();
}
@@ -264,8 +262,7 @@ void EngineSync::notifyPlaying(Syncable* pSyncable, bool playing) {
if (newMaster != nullptr && newMaster != m_pMasterSyncable) {
activateMaster(newMaster);
- setMasterParams(newMaster, newMaster->getBeatDistance(), newMaster->getBaseBpm(),
- newMaster->getBpm());
+ setMasterParams(newMaster, newMaster->getBeatDistance(), newMaster->getBaseBpm(), newMaster->getBpm());
}
pSyncable->requestSync();
@@ -416,7 +413,6 @@ void EngineSync::deactivateSync(Syncable* pSyncable) {
if (newMaster != nullptr && m_pMasterSyncable != newMaster) {
activateMaster(newMaster);
}
-
}
EngineChannel* EngineSync::pickNonSyncSyncTarget(EngineChannel* pDontPick) const {
diff --git a/src/engine/sync/synccontrol.cpp b/src/engine/sync/synccontrol.cpp
index 9064a6a7b5..aea4416280 100644
--- a/src/engine/sync/synccontrol.cpp
+++ b/src/engine/sync/synccontrol.cpp
@@ -1,12 +1,12 @@
#include "engine/sync/synccontrol.h"
#include "control/controlobject.h"
-#include "control/controlpushbutton.h"
#include "control/controlproxy.h"
+#include "control/controlpushbutton.h"
+#include "engine/channels/enginechannel.h"
#include "engine/controls/bpmcontrol.h"
#include "engine/controls/ratecontrol.h"
#include "engine/enginebuffer.h"
-#include "engine/channels/enginechannel.h"
#include "util/assert.h"
#include "util/logger.h"
#include "util/math.h"
@@ -19,7 +19,7 @@ const double SyncControl::kBpmDouble = 2.0;
namespace {
const mixxx::Logger kLogger("SyncControl");
-} // namespace
+} // namespace
SyncControl::SyncControl(const QString& group, UserSettingsPointer pConfig,
EngineChannel* pChannel, SyncableListener* pEngineSync)
diff --git a/src/mixer/basetrackplayer.cpp b/src/mixer/basetrackplayer.cpp
index 02ddf3b77a..62f3b930e8 100644
--- a/src/mixer/basetrackplayer.cpp
+++ b/src/mixer/basetrackplayer.cpp
@@ -26,15 +26,15 @@ BaseTrackPlayer::BaseTrackPlayer(QObject* pParent, const QString& group)
}
BaseTrackPlayerImpl::BaseTrackPlayerImpl(QObject* pParent,
- UserSettingsPointer pConfig,
- EngineMaster* pMixingEngine,
- EffectsManager* pEffectsManager,
- VisualsManager* pVisualsManager,
- EngineChannel::ChannelOrientation defaultOrientation,
- const QString& group,
- bool defaultMaster,
- bool defaultHeadphones,
- bool primaryDeck)
+ UserSettingsPointer pConfig,
+ EngineMaster* pMixingEngine,
+ EffectsManager* pEffectsManager,
+ VisualsManager* pVisualsManager,
+ EngineChannel::ChannelOrientation defaultOrientation,
+ const QString& group,
+ bool defaultMaster,
+ bool defaultHeadphones,
+ bool primaryDeck)
: BaseTrackPlayer(pParent, group),
m_pConfig(pConfig),
m_pEngineMaster(pMixingEngine),
@@ -43,8 +43,7 @@ BaseTrackPlayerImpl::BaseTrackPlayerImpl(QObject* pParent,
m_pChannelToCloneFrom(nullptr) {
ChannelHandleAndGroup channelGroup =
pMixingEngine->registerChannelGroup(group);
- m_pChannel = new EngineDeck(channelGroup, pConfig, pMixingEngine,
- pEffectsManager, defaultOrientation, primaryDeck);
+ m_pChannel = new EngineDeck(channelGroup, pConfig, pMixingEngine, pEffectsManager, defaultOrientation, primaryDeck);
m_pInputConfigured = std::make_unique<ControlProxy>(group, "input_configured", this);
#ifdef __VINYLCONTROL__
diff --git a/src/mixer/basetrackplayer.h b/src/mixer/basetrackplayer.h
index cd1d5d43bc..39565511b6 100644
--- a/src/mixer/basetrackplayer.h
+++ b/src/mixer/basetrackplayer.h
@@ -52,15 +52,15 @@ class BaseTrackPlayerImpl : public BaseTrackPlayer {
Q_OBJECT
public:
BaseTrackPlayerImpl(QObject* pParent,
- UserSettingsPointer pConfig,
- EngineMaster* pMixingEngine,
- EffectsManager* pEffectsManager,
- VisualsManager* pVisualsManager,
- EngineChannel::ChannelOrientation defaultOrientation,
- const QString& group,
- bool defaultMaster,
- bool defaultHeadphones,
- bool primaryDeck);
+ UserSettingsPointer pConfig,
+ EngineMaster* pMixingEngine,
+ EffectsManager* pEffectsManager,
+ VisualsManager* pVisualsManager,
+ EngineChannel::ChannelOrientation defaultOrientation,
+ const QString& group,
+ bool defaultMaster,
+ bool defaultHeadphones,
+ bool primaryDeck);
virtual ~BaseTrackPlayerImpl();
TrackPointer getLoadedTrack() const final;
diff --git a/src/mixer/deck.cpp b/src/mixer/deck.cpp
index e7e5bc5f7e..2190ae38d6 100644
--- a/src/mixer/deck.cpp
+++ b/src/mixer/deck.cpp
@@ -1,15 +1,15 @@
#include "mixer/deck.h"
Deck::Deck(QObject* pParent,
- UserSettingsPointer pConfig,
- EngineMaster* pMixingEngine,
- EffectsManager* pEffectsManager,
- VisualsManager* pVisualsManager,
- EngineChannel::ChannelOrientation defaultOrientation,
- const QString& group) :
- BaseTrackPlayerImpl(pParent, pConfig, pMixingEngine, pEffectsManager,
- pVisualsManager, defaultOrientation, group, /*defaultMaster*/ true,
- /*defaultHeadphones*/ false, /*primaryDeck*/ true) {
+ UserSettingsPointer pConfig,
+ EngineMaster* pMixingEngine,
+ EffectsManager* pEffectsManager,
+ VisualsManager* pVisualsManager,
+ EngineChannel::ChannelOrientation defaultOrientation,
+ const QString& group)
+ : BaseTrackPlayerImpl(pParent, pConfig, pMixingEngine, pEffectsManager, pVisualsManager, defaultOrientation, group, /*defaultMaster*/ true,
+ /*defaultHeadphones*/ false,
+ /*primaryDeck*/ true) {
}
Deck::~Deck() {
diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp
index a9a6b8b12c..43cd07ac14 100644
--- a/src/mixer/playermanager.cpp
+++ b/src/mixer/playermanager.cpp
@@ -5,9 +5,8 @@
#include <QMutexLocker>
#include "control/controlobject.h"
-#include "control/controlobject.h"
-#include "effects/effectsmanager.h"
#include "effects/effectrack.h"
+#include "effects/effectsmanager.h"
#include "engine/channels/enginedeck.h"
#include "engine/enginemaster.h"
#include "library/library.h"
@@ -17,15 +16,14 @@
#include "mixer/previewdeck.h"
#include "mixer/sampler.h"
#include "mixer/samplerbank.h"
+#include "preferences/dialog/dlgprefdeck.h"
#include "soundio/soundmanager.h"
#include "track/track.h"
#include "util/assert.h"
#include "util/defs.h"
#include "util/logger.h"
-#include "util/stat.h"
#include "util/sleepableqthread.h"
-#include "preferences/dialog/dlgprefdeck.h"
-
+#include "util/stat.h"
namespace {
diff --git a/src/mixer/previewdeck.cpp b/src/mixer/previewdeck.cpp
index b3452e0acc..b0fd8c6a9e 100644
--- a/src/mixer/previewdeck.cpp
+++ b/src/mixer/previewdeck.cpp
@@ -1,15 +1,15 @@
#include "mixer/previewdeck.h"
PreviewDeck::PreviewDeck(QObject* pParent,
- UserSettingsPointer pConfig,
- EngineMaster* pMixingEngine,
- EffectsManager* pEffectsManager,
- VisualsManager* pVisualsManager,
- EngineChannel::ChannelOrientation defaultOrientation,
- QString group) :
- BaseTrackPlayerImpl(pParent, pConfig, pMixingEngine, pEffectsManager,
- pVisualsManager, defaultOrientation, group, /*defaultMaster*/ false,
- /*defaultHeadphones*/ true, /*primaryDeck*/ false) {
+ UserSettingsPointer pConfig,
+ EngineMaster* pMixingEngine,
+ EffectsManager* pEffectsManager,
+ VisualsManager* pVisualsManager,
+ EngineChannel::ChannelOrientation defaultOrientation,
+ QString group)
+ : BaseTrackPlayerImpl(pParent, pConfig, pMixingEngine, pEffectsManager, pVisualsManager, defaultOrientation, group, /*defaultMaster*/ false,
+ /*defaultHeadphones*/ true,
+ /*primaryDeck*/ false) {
}
PreviewDeck::~PreviewDeck() {
diff --git a/src/mixer/sampler.cpp b/src/mixer/sampler.cpp
index 901444c35c..1471832cdc 100644
--- a/src/mixer/sampler.cpp
+++ b/src/mixer/sampler.cpp
@@ -3,15 +3,15 @@
#include "control/controlobject.h"
Sampler::Sampler(QObject* pParent,
- UserSettingsPointer pConfig,
- EngineMaster* pMixingEngine,
- EffectsManager* pEffectsManager,
- VisualsManager* pVisualsManager,
- EngineChannel::ChannelOrientation defaultOrientation,
- QString group) :
- BaseTrackPlayerImpl(pParent, pConfig, pMixingEngine, pEffectsManager,
- pVisualsManager, defaultOrientation, group, /*defaultMaster*/ true,
- /*defaultHeadphones*/ false, /*primaryDeck*/ false) {
+ UserSettingsPointer pConfig,
+ EngineMaster* pMixingEngine,
+ EffectsManager* pEffectsManager,
+ VisualsManager* pVisualsManager,
+ EngineChannel::ChannelOrientation defaultOrientation,
+ QString group)
+ : BaseTrackPlayerImpl(pParent, pConfig, pMixingEngine, pEffectsManager, pVisualsManager, defaultOrientation, group, /*defaultMaster*/ true,
+ /*defaultHeadphones*/ false,
+ /*primaryDeck*/ false) {
}
Sampler::~Sampler() {
diff --git a/src/test/enginemastertest.cpp b/src/test/enginemastertest.cpp
index 9f2b873aac..d43f6f0ebc 100644
--- a/src/test/enginemastertest.cpp
+++ b/src/test/enginemastertest.cpp
@@ -20,10 +20,9 @@ namespace {
class EngineChannelMock : public EngineChannel {
public:
EngineChannelMock(const QString& group,
- ChannelOrientation defaultOrientation,
- EngineMaster* pMaster)
- : EngineChannel(pMaster->registerChannelGroup(group), defaultOrientation,
- nullptr, /*isTalkoverChannel*/ false, /*isPrimarydeck*/ true) {
+ ChannelOrientation defaultOrientation,
+ EngineMaster* pMaster)
+ : EngineChannel(pMaster->registerChannelGroup(group), defaultOrientation, nullptr, /*isTalkoverChannel*/ false, /*isPrimarydeck*/ true) {
}
void applyVolume(CSAMPLE* pBuff, const int iBufferSize) {
diff --git a/src/test/enginesynctest.cpp b/src/test/enginesynctest.cpp
index 1709e9e71c..c6fb80b46a 100644
--- a/src/test/enginesynctest.cpp
+++ b/src/test/enginesynctest.cpp
@@ -53,8 +53,9 @@ class EngineSyncTest : public MockedEngineBackendTest {
void assertIsFollower(QString group) {
if (group == m_sInternalClockGroup) {
ASSERT_EQ(0,
- ControlObject::getControl(ConfigKey(m_sInternalClockGroup,
- "sync_master"))->get());
+ ControlObject::getControl(ConfigKey(m_sInternalClockGroup,
+ "sync_master"))
+ ->get());
} else {
ASSERT_EQ(SYNC_FOLLOWER, ControlObject::getControl(ConfigKey(group, "sync_mode"))->get());
ASSERT_EQ(1, ControlObject::getControl(ConfigKey(group, "sync_enabled"))->get());
@@ -655,7 +656,6 @@ TEST_F(EngineSyncTest, EnableOneDeckInitsMaster) {
"beat_distance")));
}
-
TEST_F(EngineSyncTest, EnableOneDeckInitializesMaster) {
// Enabling sync on a deck causes it to be master, and sets bpm and clock.
auto pFileBpm1 = std::make_unique<ControlProxy>(m_sGroup1, "file_bpm");
diff --git a/src/vinylcontrol/vinylcontrolmanager.h b/src/vinylcontrol/vinylcontrolmanager.h
index 0b85a2e0d6..bbd26808d4 100644
--- a/src/vinylcontrol/vinylcontrolmanager.h
+++ b/src/vinylcontrol/vinylcontrolmanager.h
@@ -11,10 +11,10 @@
#include <QString>
#include <QTimerEvent>
-#include "soundio/soundmanagerutil.h"
#include "preferences/usersettings.h"
-#include "vinylcontrol/vinylsignalquality.h"
+#include "soundio/soundmanagerutil.h"
#include "util/defs.h"
+#include "vinylcontrol/vinylsignalquality.h"
class ControlProxy;
class ControlPushButton;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 10:22:47 +0000