From 392edc844b59e2e6201c028cdb9d22b7db1de173 Mon Sep 17 00:00:00 2001 From: Owen Williams Date: Mon, 16 Mar 2020 10:24:35 -0400 Subject: master sync: clang-format changed lines --- src/mixer/basetrackplayer.cpp | 21 ++++++++++----------- src/mixer/basetrackplayer.h | 18 +++++++++--------- src/mixer/deck.cpp | 18 +++++++++--------- src/mixer/playermanager.cpp | 8 +++----- src/mixer/previewdeck.cpp | 18 +++++++++--------- src/mixer/sampler.cpp | 18 +++++++++--------- 6 files changed, 49 insertions(+), 52 deletions(-) (limited to 'src/mixer') 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(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 #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() { -- cgit v1.2.3