From 1bbbd48c3ed239399007524d563a16b82e2643bf Mon Sep 17 00:00:00 2001 From: xerus2000 <27jf@pm.me> Date: Thu, 30 Jul 2020 14:01:51 +0200 Subject: [PATCH] Rename handle_group to handleGroup globally --- src/effects/effectchain.cpp | 24 +++++++++--------- src/effects/effectchain.h | 6 ++--- src/effects/effectchainmanager.cpp | 14 +++++------ src/effects/effectchainmanager.h | 4 +-- src/effects/effectchainslot.cpp | 31 ++++++++++++------------ src/effects/effectchainslot.h | 9 +++---- src/effects/effectrack.cpp | 22 ++++++++--------- src/effects/effectrack.h | 2 +- src/effects/effectsmanager.cpp | 8 +++--- src/effects/effectsmanager.h | 4 +-- src/engine/channelhandle.h | 4 +-- src/engine/channels/engineaux.cpp | 4 +-- src/engine/channels/engineaux.h | 2 +- src/engine/channels/enginechannel.cpp | 6 ++--- src/engine/channels/enginechannel.h | 2 +- src/engine/channels/enginedeck.cpp | 5 ++-- src/engine/channels/enginedeck.h | 3 ++- src/engine/channels/enginemicrophone.cpp | 4 +-- src/engine/channels/enginemicrophone.h | 4 +-- src/mixer/basetrackplayer.cpp | 6 ++--- src/mixer/basetrackplayer.h | 2 +- src/mixer/deck.cpp | 4 +-- src/mixer/deck.h | 2 +- src/mixer/playermanager.cpp | 28 ++++++++++----------- src/mixer/previewdeck.cpp | 4 +-- src/mixer/previewdeck.h | 2 +- src/mixer/sampler.cpp | 4 +-- src/mixer/sampler.h | 2 +- 28 files changed, 106 insertions(+), 106 deletions(-) diff --git a/src/effects/effectchain.cpp b/src/effects/effectchain.cpp index c24442a90f5e..06954a0bcfee 100644 --- a/src/effects/effectchain.cpp +++ b/src/effects/effectchain.cpp @@ -155,12 +155,12 @@ void EffectChain::setEnabled(bool enabled) { emit enabledChanged(enabled); } -void EffectChain::enableForInputChannel(const ChannelHandleAndGroup& handle_group) { +void EffectChain::enableForInputChannel(const ChannelHandleAndGroup& handleGroup) { // TODO(Be): remove m_enabledChannels from this class and move this logic // to EffectChainSlot - bool bWasAlreadyEnabled = m_enabledInputChannels.contains(handle_group); + bool bWasAlreadyEnabled = m_enabledInputChannels.contains(handleGroup); if (!bWasAlreadyEnabled) { - m_enabledInputChannels.insert(handle_group); + m_enabledInputChannels.insert(handleGroup); } // The allocation of EffectStates below may be expensive, so avoid it if @@ -172,7 +172,7 @@ void EffectChain::enableForInputChannel(const ChannelHandleAndGroup& handle_grou EffectsRequest* request = new EffectsRequest(); request->type = EffectsRequest::ENABLE_EFFECT_CHAIN_FOR_INPUT_CHANNEL; request->pTargetChain = m_pEngineEffectChain; - request->EnableInputChannelForChain.pChannelHandle = &handle_group.handle(); + request->EnableInputChannelForChain.pChannelHandle = &handleGroup.handle(); // Allocate EffectStates here in the main thread to avoid allocating // memory in the realtime audio callback thread. Pointers to the @@ -191,7 +191,7 @@ void EffectChain::enableForInputChannel(const ChannelHandleAndGroup& handle_grou if (m_effects[i] != nullptr) { for (const auto& outputChannel : m_pEffectsManager->registeredOutputChannels()) { if (kEffectDebugOutput) { - qDebug() << debugString() << "EffectChain::enableForInputChannel creating EffectState for input" << handle_group << "output" << outputChannel; + qDebug() << debugString() << "EffectChain::enableForInputChannel creating EffectState for input" << handleGroup << "output" << outputChannel; } statesMap.insert(outputChannel.handle(), m_effects[i]->createState(bufferParameters)); @@ -208,25 +208,25 @@ void EffectChain::enableForInputChannel(const ChannelHandleAndGroup& handle_grou request->EnableInputChannelForChain.pEffectStatesMapArray = pEffectStatesMapArray; m_pEffectsManager->writeRequest(request); - emit channelStatusChanged(handle_group.name(), true); + emit channelStatusChanged(handleGroup.name(), true); } -bool EffectChain::enabledForChannel(const ChannelHandleAndGroup& handle_group) const { - return m_enabledInputChannels.contains(handle_group); +bool EffectChain::enabledForChannel(const ChannelHandleAndGroup& handleGroup) const { + return m_enabledInputChannels.contains(handleGroup); } -void EffectChain::disableForInputChannel(const ChannelHandleAndGroup& handle_group) { - if (m_enabledInputChannels.remove(handle_group)) { +void EffectChain::disableForInputChannel(const ChannelHandleAndGroup& handleGroup) { + if (m_enabledInputChannels.remove(handleGroup)) { if (!m_bAddedToEngine) { return; } EffectsRequest* request = new EffectsRequest(); request->type = EffectsRequest::DISABLE_EFFECT_CHAIN_FOR_INPUT_CHANNEL; request->pTargetChain = m_pEngineEffectChain; - request->DisableInputChannelForChain.pChannelHandle = &handle_group.handle(); + request->DisableInputChannelForChain.pChannelHandle = &handleGroup.handle(); m_pEffectsManager->writeRequest(request); - emit channelStatusChanged(handle_group.name(), false); + emit channelStatusChanged(handleGroup.name(), false); } } diff --git a/src/effects/effectchain.h b/src/effects/effectchain.h index 6b074ffa2a48..16b0370db92a 100644 --- a/src/effects/effectchain.h +++ b/src/effects/effectchain.h @@ -39,10 +39,10 @@ class EffectChain : public QObject { void setEnabled(bool enabled); // Activates EffectChain processing for the provided channel. - void enableForInputChannel(const ChannelHandleAndGroup& handle_group); - bool enabledForChannel(const ChannelHandleAndGroup& handle_group) const; + void enableForInputChannel(const ChannelHandleAndGroup& handleGroup); + bool enabledForChannel(const ChannelHandleAndGroup& handleGroup) const; const QSet& enabledChannels() const; - void disableForInputChannel(const ChannelHandleAndGroup& handle_group); + void disableForInputChannel(const ChannelHandleAndGroup& handleGroup); EffectChainPointer prototype() const; diff --git a/src/effects/effectchainmanager.cpp b/src/effects/effectchainmanager.cpp index 595f5e010ffc..f472a766f52d 100644 --- a/src/effects/effectchainmanager.cpp +++ b/src/effects/effectchainmanager.cpp @@ -18,22 +18,22 @@ EffectChainManager::~EffectChainManager() { //qDebug() << debugString() << "destroyed"; } -void EffectChainManager::registerInputChannel(const ChannelHandleAndGroup& handle_group) { - VERIFY_OR_DEBUG_ASSERT(!m_registeredInputChannels.contains(handle_group)) { +void EffectChainManager::registerInputChannel(const ChannelHandleAndGroup& handleGroup) { + VERIFY_OR_DEBUG_ASSERT(!m_registeredInputChannels.contains(handleGroup)) { return; } - m_registeredInputChannels.insert(handle_group); + m_registeredInputChannels.insert(handleGroup); for (auto& pRack : m_standardEffectRacks) { - pRack->registerInputChannel(handle_group); + pRack->registerInputChannel(handleGroup); } } -void EffectChainManager::registerOutputChannel(const ChannelHandleAndGroup& handle_group) { - VERIFY_OR_DEBUG_ASSERT(!m_registeredOutputChannels.contains(handle_group)) { +void EffectChainManager::registerOutputChannel(const ChannelHandleAndGroup& handleGroup) { + VERIFY_OR_DEBUG_ASSERT(!m_registeredOutputChannels.contains(handleGroup)) { return; } - m_registeredOutputChannels.insert(handle_group); + m_registeredOutputChannels.insert(handleGroup); } StandardEffectRackPointer EffectChainManager::addStandardEffectRack() { diff --git a/src/effects/effectchainmanager.h b/src/effects/effectchainmanager.h index 12ea3fb3073a..2b7d6fc94a12 100644 --- a/src/effects/effectchainmanager.h +++ b/src/effects/effectchainmanager.h @@ -24,12 +24,12 @@ class EffectChainManager : public QObject { EffectsManager* pEffectsManager); virtual ~EffectChainManager(); - void registerInputChannel(const ChannelHandleAndGroup& handle_group); + void registerInputChannel(const ChannelHandleAndGroup& handleGroup); const QSet& registeredInputChannels() const { return m_registeredInputChannels; } - void registerOutputChannel(const ChannelHandleAndGroup& handle_group); + void registerOutputChannel(const ChannelHandleAndGroup& handleGroup); const QSet& registeredOutputChannels() const { return m_registeredOutputChannels; } diff --git a/src/effects/effectchainslot.cpp b/src/effects/effectchainslot.cpp index ab83e2b51771..3cf25aab0aae 100644 --- a/src/effects/effectchainslot.cpp +++ b/src/effects/effectchainslot.cpp @@ -242,9 +242,9 @@ void EffectChainSlot::updateRoutingSwitches() { } for (const ChannelInfo* pChannelInfo : m_channelInfoByName) { if (pChannelInfo->pEnabled->toBool()) { - m_pEffectChain->enableForInputChannel(pChannelInfo->handle_group); + m_pEffectChain->enableForInputChannel(pChannelInfo->handleGroup); } else { - m_pEffectChain->disableForInputChannel(pChannelInfo->handle_group); + m_pEffectChain->disableForInputChannel(pChannelInfo->handleGroup); } } } @@ -314,27 +314,26 @@ EffectSlotPointer EffectChainSlot::addEffectSlot(const QString& group) { return pSlot; } -void EffectChainSlot::registerInputChannel(const ChannelHandleAndGroup& handle_group) { - VERIFY_OR_DEBUG_ASSERT(!m_channelInfoByName.contains(handle_group.name())) { +void EffectChainSlot::registerInputChannel(const ChannelHandleAndGroup& handleGroup) { + VERIFY_OR_DEBUG_ASSERT(!m_channelInfoByName.contains(handleGroup.name())) { return; } double initialValue = 0.0; int deckNumber; - if (PlayerManager::isDeckGroup(handle_group.name(), &deckNumber) && - (m_iChainSlotNumber + 1) == (unsigned) deckNumber) { + if (PlayerManager::isDeckGroup(handleGroup.name(), &deckNumber) && + (m_iChainSlotNumber + 1) == (unsigned)deckNumber) { initialValue = 1.0; } ControlPushButton* pEnableControl = new ControlPushButton( - ConfigKey(m_group, QString("group_%1_enable").arg(handle_group.name())), - true, initialValue); + ConfigKey(m_group, QString("group_%1_enable").arg(handleGroup.name())), + true, + initialValue); pEnableControl->setButtonMode(ControlPushButton::POWERWINDOW); - ChannelInfo* pInfo = new ChannelInfo(handle_group, pEnableControl); - m_channelInfoByName[handle_group.name()] = pInfo; - connect(pEnableControl, &ControlPushButton::valueChanged, - this, [this, handle_group] { slotChannelStatusChanged(handle_group.name()); }); - + ChannelInfo* pInfo = new ChannelInfo(handleGroup, pEnableControl); + m_channelInfoByName[handleGroup.name()] = pInfo; + connect(pEnableControl, &ControlPushButton::valueChanged, this, [this, handleGroup] { slotChannelStatusChanged(handleGroup.name()); }); } void EffectChainSlot::slotEffectLoaded(EffectPointer pEffect, unsigned int slotNumber) { @@ -433,12 +432,12 @@ void EffectChainSlot::slotControlChainPrevPreset(double v) { void EffectChainSlot::slotChannelStatusChanged(const QString& group) { if (m_pEffectChain) { ChannelInfo* pChannelInfo = m_channelInfoByName.value(group, NULL); - if (pChannelInfo != NULL && pChannelInfo->pEnabled != NULL) { + if (pChannelInfo != nullptr && pChannelInfo->pEnabled != nullptr) { bool bEnable = pChannelInfo->pEnabled->toBool(); if (bEnable) { - m_pEffectChain->enableForInputChannel(pChannelInfo->handle_group); + m_pEffectChain->enableForInputChannel(pChannelInfo->handleGroup); } else { - m_pEffectChain->disableForInputChannel(pChannelInfo->handle_group); + m_pEffectChain->disableForInputChannel(pChannelInfo->handleGroup); } } } diff --git a/src/effects/effectchainslot.h b/src/effects/effectchainslot.h index 8df609772ddd..a5d3a25f0211 100644 --- a/src/effects/effectchainslot.h +++ b/src/effects/effectchainslot.h @@ -34,7 +34,7 @@ class EffectChainSlot : public QObject { EffectChainPointer getEffectChain() const; EffectChainPointer getOrCreateEffectChain(EffectsManager* pEffectsManager); - void registerInputChannel(const ChannelHandleAndGroup& handle_group); + void registerInputChannel(const ChannelHandleAndGroup& handleGroup); double getSuperParameter() const; void setSuperParameter(double value, bool force = false); @@ -153,15 +153,14 @@ class EffectChainSlot : public QObject { struct ChannelInfo { // Takes ownership of pEnabled. - ChannelInfo(const ChannelHandleAndGroup& handle_group, ControlObject* pEnabled) - : handle_group(handle_group), + ChannelInfo(const ChannelHandleAndGroup& handleGroup, ControlObject* pEnabled) + : handleGroup(handleGroup), pEnabled(pEnabled) { - } ~ChannelInfo() { delete pEnabled; } - ChannelHandleAndGroup handle_group; + ChannelHandleAndGroup handleGroup; ControlObject* pEnabled; }; QMap m_channelInfoByName; diff --git a/src/effects/effectrack.cpp b/src/effects/effectrack.cpp index 95dda5e90d88..09fbb113fe6d 100644 --- a/src/effects/effectrack.cpp +++ b/src/effects/effectrack.cpp @@ -73,9 +73,9 @@ void EffectRack::removeFromEngine() { m_pEngineEffectRack = NULL; } -void EffectRack::registerInputChannel(const ChannelHandleAndGroup& handle_group) { +void EffectRack::registerInputChannel(const ChannelHandleAndGroup& handleGroup) { foreach (EffectChainSlotPointer pChainSlot, m_effectChainSlots) { - pChainSlot->registerInputChannel(handle_group); + pChainSlot->registerInputChannel(handleGroup); } } @@ -260,8 +260,8 @@ EffectChainSlotPointer StandardEffectRack::addEffectChainSlot() { // Register all the existing channels with the new EffectChain. const QSet& registeredChannels = m_pEffectChainManager->registeredInputChannels(); - for (const ChannelHandleAndGroup& handle_group : registeredChannels) { - pChainSlot->registerInputChannel(handle_group); + for (const ChannelHandleAndGroup& handleGroup : registeredChannels) { + pChainSlot->registerInputChannel(handleGroup); } EffectChainSlotPointer pChainSlotPointer = EffectChainSlotPointer(pChainSlot); @@ -300,9 +300,9 @@ OutputEffectRack::OutputEffectRack(EffectsManager* pEffectsManager, // TODO(Be): Remove this hideous hack to get the ChannelHandleAndGroup const QSet& registeredChannels = m_pEffectChainManager->registeredInputChannels(); - for (const ChannelHandleAndGroup& handle_group : registeredChannels) { - if (handle_group.name() == "[MasterOutput]") { - masterHandleAndGroup = &handle_group; + for (const ChannelHandleAndGroup& handleGroup : registeredChannels) { + if (handleGroup.name() == "[MasterOutput]") { + masterHandleAndGroup = &handleGroup; break; } } @@ -349,10 +349,10 @@ void PerGroupRack::setupForGroup(const QString& groupName) { // TODO(rryan): remove. const ChannelHandleAndGroup* handleAndGroup = nullptr; - for (const ChannelHandleAndGroup& handle_group : - m_pEffectChainManager->registeredInputChannels()) { - if (handle_group.name() == groupName) { - handleAndGroup = &handle_group; + for (const ChannelHandleAndGroup& handleGroup : + m_pEffectChainManager->registeredInputChannels()) { + if (handleGroup.name() == groupName) { + handleAndGroup = &handleGroup; break; } } diff --git a/src/effects/effectrack.h b/src/effects/effectrack.h index 0731afd5a4f1..44f8b5e1ea15 100644 --- a/src/effects/effectrack.h +++ b/src/effects/effectrack.h @@ -30,7 +30,7 @@ class EffectRack : public QObject { void removeFromEngine(); EngineEffectRack* getEngineEffectRack(); - void registerInputChannel(const ChannelHandleAndGroup& handle_group); + void registerInputChannel(const ChannelHandleAndGroup& handleGroup); int numEffectChainSlots() const; EffectChainSlotPointer getEffectChainSlot(int i); diff --git a/src/effects/effectsmanager.cpp b/src/effects/effectsmanager.cpp index 8858c46b4ab2..c1e62f310d74 100644 --- a/src/effects/effectsmanager.cpp +++ b/src/effects/effectsmanager.cpp @@ -106,16 +106,16 @@ void EffectsManager::slotBackendRegisteredEffect(EffectManifestPointer pManifest m_pNumEffectsAvailable->forceSet(m_availableEffectManifests.size()); } -void EffectsManager::registerInputChannel(const ChannelHandleAndGroup& handle_group) { - m_pEffectChainManager->registerInputChannel(handle_group); +void EffectsManager::registerInputChannel(const ChannelHandleAndGroup& handleGroup) { + m_pEffectChainManager->registerInputChannel(handleGroup); } const QSet& EffectsManager::registeredInputChannels() const { return m_pEffectChainManager->registeredInputChannels(); } -void EffectsManager::registerOutputChannel(const ChannelHandleAndGroup& handle_group) { - m_pEffectChainManager->registerOutputChannel(handle_group); +void EffectsManager::registerOutputChannel(const ChannelHandleAndGroup& handleGroup) { + m_pEffectChainManager->registerOutputChannel(handleGroup); } const QSet& EffectsManager::registeredOutputChannels() const { diff --git a/src/effects/effectsmanager.h b/src/effects/effectsmanager.h index 0afd5e547518..c7d80fc76bd6 100644 --- a/src/effects/effectsmanager.h +++ b/src/effects/effectsmanager.h @@ -47,8 +47,8 @@ class EffectsManager : public QObject { // takes ownership of the backend, and will delete it when EffectsManager is // being deleted. Not thread safe -- use only from the GUI thread. void addEffectsBackend(EffectsBackend* pEffectsBackend); - void registerInputChannel(const ChannelHandleAndGroup& handle_group); - void registerOutputChannel(const ChannelHandleAndGroup& handle_group); + void registerInputChannel(const ChannelHandleAndGroup& handleGroup); + void registerOutputChannel(const ChannelHandleAndGroup& handleGroup); const QSet& registeredInputChannels() const; const QSet& registeredOutputChannels() const; diff --git a/src/engine/channelhandle.h b/src/engine/channelhandle.h index b0c8e9d1bc27..ad74a439b185 100644 --- a/src/engine/channelhandle.h +++ b/src/engine/channelhandle.h @@ -116,9 +116,9 @@ inline QDebug operator<<(QDebug stream, const ChannelHandleAndGroup& g) { } inline uint qHash( - const ChannelHandleAndGroup& handle_group, + const ChannelHandleAndGroup& handleGroup, uint seed = 0) { - return qHash(handle_group.handle(), seed); + return qHash(handleGroup.handle(), seed); } // A helper class used by EngineMaster to assign ChannelHandles to channel group diff --git a/src/engine/channels/engineaux.cpp b/src/engine/channels/engineaux.cpp index d67b8912e5c7..e98682f6b1c9 100644 --- a/src/engine/channels/engineaux.cpp +++ b/src/engine/channels/engineaux.cpp @@ -13,8 +13,8 @@ #include "engine/effects/engineeffectsmanager.h" #include "util/sample.h" -EngineAux::EngineAux(const ChannelHandleAndGroup& handle_group, EffectsManager* pEffectsManager) - : EngineChannel(handle_group, EngineChannel::CENTER, pEffectsManager, +EngineAux::EngineAux(const ChannelHandleAndGroup& handleGroup, EffectsManager* pEffectsManager) + : EngineChannel(handleGroup, EngineChannel::CENTER, pEffectsManager, /*isTalkoverChannel*/ false, /*isPrimaryDeck*/ false), m_pInputConfigured(new ControlObject(ConfigKey(getGroup(), "input_configured"))), diff --git a/src/engine/channels/engineaux.h b/src/engine/channels/engineaux.h index cf01a5aad335..e32c26a393af 100644 --- a/src/engine/channels/engineaux.h +++ b/src/engine/channels/engineaux.h @@ -20,7 +20,7 @@ class ControlAudioTaperPot; class EngineAux : public EngineChannel, public AudioDestination { Q_OBJECT public: - EngineAux(const ChannelHandleAndGroup& handle_group, EffectsManager* pEffectsManager); + EngineAux(const ChannelHandleAndGroup& handleGroup, EffectsManager* pEffectsManager); virtual ~EngineAux(); bool isActive(); diff --git a/src/engine/channels/enginechannel.cpp b/src/engine/channels/enginechannel.cpp index 9ecd33c9ceb7..6cd03f9347c1 100644 --- a/src/engine/channels/enginechannel.cpp +++ b/src/engine/channels/enginechannel.cpp @@ -20,12 +20,12 @@ #include "control/controlobject.h" #include "control/controlpushbutton.h" -EngineChannel::EngineChannel(const ChannelHandleAndGroup& handle_group, +EngineChannel::EngineChannel(const ChannelHandleAndGroup& handleGroup, EngineChannel::ChannelOrientation defaultOrientation, EffectsManager* pEffectsManager, bool isTalkoverChannel, bool isPrimaryDeck) - : m_group(handle_group), + : m_group(handleGroup), m_pEffectsManager(pEffectsManager), m_vuMeter(getGroup()), m_pSampleRate(new ControlProxy("[Master]", "samplerate")), @@ -53,7 +53,7 @@ EngineChannel::EngineChannel(const ChannelHandleAndGroup& handle_group, m_pTalkover->setButtonMode(ControlPushButton::POWERWINDOW); if (m_pEffectsManager != nullptr) { - m_pEffectsManager->registerInputChannel(handle_group); + m_pEffectsManager->registerInputChannel(handleGroup); } } diff --git a/src/engine/channels/enginechannel.h b/src/engine/channels/enginechannel.h index 0dbdd35da8b1..2d71ddd9e403 100644 --- a/src/engine/channels/enginechannel.h +++ b/src/engine/channels/enginechannel.h @@ -39,7 +39,7 @@ class EngineChannel : public EngineObject { RIGHT, }; - EngineChannel(const ChannelHandleAndGroup& handle_group, + EngineChannel(const ChannelHandleAndGroup& handleGroup, ChannelOrientation defaultOrientation, EffectsManager* pEffectsManager, bool isTalkoverChannel, diff --git a/src/engine/channels/enginedeck.cpp b/src/engine/channels/enginedeck.cpp index 73a1981936d7..8eba8b3eea69 100644 --- a/src/engine/channels/enginedeck.cpp +++ b/src/engine/channels/enginedeck.cpp @@ -9,13 +9,14 @@ #include "util/sample.h" #include "waveform/waveformwidgetfactory.h" -EngineDeck::EngineDeck(const ChannelHandleAndGroup& handle_group, +EngineDeck::EngineDeck( + const ChannelHandleAndGroup& handleGroup, UserSettingsPointer pConfig, EngineMaster* pMixingEngine, EffectsManager* pEffectsManager, EngineChannel::ChannelOrientation defaultOrientation, bool primaryDeck) - : EngineChannel(handle_group, defaultOrientation, pEffectsManager, + : EngineChannel(handleGroup, defaultOrientation, pEffectsManager, /*isTalkoverChannel*/ false, primaryDeck), m_pConfig(pConfig), diff --git a/src/engine/channels/enginedeck.h b/src/engine/channels/enginedeck.h index a77447541d43..7ef08d7434c0 100644 --- a/src/engine/channels/enginedeck.h +++ b/src/engine/channels/enginedeck.h @@ -22,7 +22,8 @@ class ControlPushButton; class EngineDeck : public EngineChannel, public AudioDestination { Q_OBJECT public: - EngineDeck(const ChannelHandleAndGroup& handle_group, + EngineDeck( + const ChannelHandleAndGroup& handleGroup, UserSettingsPointer pConfig, EngineMaster* pMixingEngine, EffectsManager* pEffectsManager, diff --git a/src/engine/channels/enginemicrophone.cpp b/src/engine/channels/enginemicrophone.cpp index ddc78fa88231..af1e1e150d66 100644 --- a/src/engine/channels/enginemicrophone.cpp +++ b/src/engine/channels/enginemicrophone.cpp @@ -12,9 +12,9 @@ #include "engine/effects/engineeffectsmanager.h" #include "util/sample.h" -EngineMicrophone::EngineMicrophone(const ChannelHandleAndGroup& handle_group, +EngineMicrophone::EngineMicrophone(const ChannelHandleAndGroup& handleGroup, EffectsManager* pEffectsManager) - : EngineChannel(handle_group, EngineChannel::CENTER, pEffectsManager, + : EngineChannel(handleGroup, EngineChannel::CENTER, pEffectsManager, /*isTalkoverChannel*/ true, /*isPrimaryDeck*/ false), m_pInputConfigured(new ControlObject(ConfigKey(getGroup(), "input_configured"))), diff --git a/src/engine/channels/enginemicrophone.h b/src/engine/channels/enginemicrophone.h index f3ac6f0b3e44..3eb0b57f1e14 100644 --- a/src/engine/channels/enginemicrophone.h +++ b/src/engine/channels/enginemicrophone.h @@ -22,8 +22,8 @@ class ControlAudioTaperPot; class EngineMicrophone : public EngineChannel, public AudioDestination { Q_OBJECT public: - EngineMicrophone(const ChannelHandleAndGroup& handle_group, - EffectsManager* pEffectsManager); + EngineMicrophone(const ChannelHandleAndGroup& handleGroup, + EffectsManager* pEffectsManager); virtual ~EngineMicrophone(); bool isActive(); diff --git a/src/mixer/basetrackplayer.cpp b/src/mixer/basetrackplayer.cpp index cd80b2c666bf..271cf8e69158 100644 --- a/src/mixer/basetrackplayer.cpp +++ b/src/mixer/basetrackplayer.cpp @@ -41,17 +41,17 @@ BaseTrackPlayerImpl::BaseTrackPlayerImpl( EffectsManager* pEffectsManager, VisualsManager* pVisualsManager, EngineChannel::ChannelOrientation defaultOrientation, - const ChannelHandleAndGroup& handle_group, + const ChannelHandleAndGroup& handleGroup, bool defaultMaster, bool defaultHeadphones, bool primaryDeck) - : BaseTrackPlayer(pParent, handle_group.name()), + : BaseTrackPlayer(pParent, handleGroup.name()), m_pConfig(pConfig), m_pEngineMaster(pMixingEngine), m_pLoadedTrack(), m_replaygainPending(false), m_pChannelToCloneFrom(nullptr) { - m_pChannel = new EngineDeck(handle_group, + m_pChannel = new EngineDeck(handleGroup, pConfig, pMixingEngine, pEffectsManager, diff --git a/src/mixer/basetrackplayer.h b/src/mixer/basetrackplayer.h index 2308dac8fdae..403c696c1c38 100644 --- a/src/mixer/basetrackplayer.h +++ b/src/mixer/basetrackplayer.h @@ -58,7 +58,7 @@ class BaseTrackPlayerImpl : public BaseTrackPlayer { EffectsManager* pEffectsManager, VisualsManager* pVisualsManager, EngineChannel::ChannelOrientation defaultOrientation, - const ChannelHandleAndGroup& handle_group, + const ChannelHandleAndGroup& handleGroup, bool defaultMaster, bool defaultHeadphones, bool primaryDeck); diff --git a/src/mixer/deck.cpp b/src/mixer/deck.cpp index 09575e7e7e6e..98cb44663441 100644 --- a/src/mixer/deck.cpp +++ b/src/mixer/deck.cpp @@ -6,14 +6,14 @@ Deck::Deck(QObject* pParent, EffectsManager* pEffectsManager, VisualsManager* pVisualsManager, EngineChannel::ChannelOrientation defaultOrientation, - const ChannelHandleAndGroup& handle_group) + const ChannelHandleAndGroup& handleGroup) : BaseTrackPlayerImpl(pParent, pConfig, pMixingEngine, pEffectsManager, pVisualsManager, defaultOrientation, - handle_group, + handleGroup, /*defaultMaster*/ true, /*defaultHeadphones*/ false, /*primaryDeck*/ true) { diff --git a/src/mixer/deck.h b/src/mixer/deck.h index 76e8ae9d241d..f53dcd3893c8 100644 --- a/src/mixer/deck.h +++ b/src/mixer/deck.h @@ -13,6 +13,6 @@ class Deck : public BaseTrackPlayerImpl { EffectsManager* pEffectsManager, VisualsManager* pVisualsManager, EngineChannel::ChannelOrientation defaultOrientation, - const ChannelHandleAndGroup& handle_group); + const ChannelHandleAndGroup& handleGroup); ~Deck() override = default; }; diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp index aa20b88182f0..8c27e0704f82 100644 --- a/src/mixer/playermanager.cpp +++ b/src/mixer/playermanager.cpp @@ -358,9 +358,9 @@ void PlayerManager::addConfiguredDecks() { void PlayerManager::addDeckInner() { // Do not lock m_mutex here. - ChannelHandleAndGroup handle_group = + ChannelHandleAndGroup handleGroup = m_pEngine->registerChannelGroup(groupForDeck(m_decks.count())); - VERIFY_OR_DEBUG_ASSERT(!m_players.contains(handle_group.handle())) { + VERIFY_OR_DEBUG_ASSERT(!m_players.contains(handleGroup.handle())) { return; } @@ -372,7 +372,7 @@ void PlayerManager::addDeckInner() { m_pEffectsManager, m_pVisualsManager, deckIndex % 2 == 1 ? EngineChannel::RIGHT : EngineChannel::LEFT, - handle_group); + handleGroup); connect(pDeck->getEngineDeck(), &EngineDeck::noPassthroughInputConfigured, this, @@ -389,7 +389,7 @@ void PlayerManager::addDeckInner() { &PlayerManager::slotAnalyzeTrack); } - m_players[handle_group.handle()] = pDeck; + m_players[handleGroup.handle()] = pDeck; m_decks.append(pDeck); // Register the deck output with SoundManager. @@ -406,7 +406,7 @@ void PlayerManager::addDeckInner() { VERIFY_OR_DEBUG_ASSERT(pEqRack) { return; } - pEqRack->setupForGroup(handle_group.name()); + pEqRack->setupForGroup(handleGroup.name()); // BaseTrackPlayer needs to delay until we have setup the equalizer rack for // this deck to fetch the legacy EQ controls. @@ -419,7 +419,7 @@ void PlayerManager::addDeckInner() { VERIFY_OR_DEBUG_ASSERT(pQuickEffectRack) { return; } - pQuickEffectRack->setupForGroup(handle_group.name()); + pQuickEffectRack->setupForGroup(handleGroup.name()); } void PlayerManager::loadSamplers() { @@ -435,9 +435,9 @@ void PlayerManager::addSampler() { void PlayerManager::addSamplerInner() { // Do not lock m_mutex here. - ChannelHandleAndGroup handle_group = + ChannelHandleAndGroup handleGroup = m_pEngine->registerChannelGroup(groupForSampler(m_decks.count())); - VERIFY_OR_DEBUG_ASSERT(!m_players.contains(handle_group.handle())) { + VERIFY_OR_DEBUG_ASSERT(!m_players.contains(handleGroup.handle())) { return; } @@ -450,7 +450,7 @@ void PlayerManager::addSamplerInner() { m_pEffectsManager, m_pVisualsManager, orientation, - handle_group); + handleGroup); if (m_pTrackAnalysisScheduler) { connect(pSampler, &Sampler::newTrackLoaded, @@ -458,7 +458,7 @@ void PlayerManager::addSamplerInner() { &PlayerManager::slotAnalyzeTrack); } - m_players[handle_group.handle()] = pSampler; + m_players[handleGroup.handle()] = pSampler; m_samplers.append(pSampler); } @@ -469,9 +469,9 @@ void PlayerManager::addPreviewDeck() { void PlayerManager::addPreviewDeckInner() { // Do not lock m_mutex here. - ChannelHandleAndGroup handle_group = m_pEngine->registerChannelGroup( + ChannelHandleAndGroup handleGroup = m_pEngine->registerChannelGroup( groupForPreviewDeck(m_decks.count())); - VERIFY_OR_DEBUG_ASSERT(!m_players.contains(handle_group.handle())) { + VERIFY_OR_DEBUG_ASSERT(!m_players.contains(handleGroup.handle())) { return; } @@ -484,7 +484,7 @@ void PlayerManager::addPreviewDeckInner() { m_pEffectsManager, m_pVisualsManager, orientation, - handle_group); + handleGroup); if (m_pTrackAnalysisScheduler) { connect(pPreviewDeck, &PreviewDeck::newTrackLoaded, @@ -492,7 +492,7 @@ void PlayerManager::addPreviewDeckInner() { &PlayerManager::slotAnalyzeTrack); } - m_players[handle_group.handle()] = pPreviewDeck; + m_players[handleGroup.handle()] = pPreviewDeck; m_preview_decks.append(pPreviewDeck); } diff --git a/src/mixer/previewdeck.cpp b/src/mixer/previewdeck.cpp index 9fc8f881a9cc..e6e63c36e4af 100644 --- a/src/mixer/previewdeck.cpp +++ b/src/mixer/previewdeck.cpp @@ -6,14 +6,14 @@ PreviewDeck::PreviewDeck(QObject* pParent, EffectsManager* pEffectsManager, VisualsManager* pVisualsManager, EngineChannel::ChannelOrientation defaultOrientation, - const ChannelHandleAndGroup& handle_group) + const ChannelHandleAndGroup& handleGroup) : BaseTrackPlayerImpl(pParent, pConfig, pMixingEngine, pEffectsManager, pVisualsManager, defaultOrientation, - handle_group, + handleGroup, /*defaultMaster*/ false, /*defaultHeadphones*/ true, /*primaryDeck*/ false) { diff --git a/src/mixer/previewdeck.h b/src/mixer/previewdeck.h index 67885ec9361f..71c4d36467e7 100644 --- a/src/mixer/previewdeck.h +++ b/src/mixer/previewdeck.h @@ -12,7 +12,7 @@ class PreviewDeck : public BaseTrackPlayerImpl { EffectsManager* pEffectsManager, VisualsManager* pVisualsManager, EngineChannel::ChannelOrientation defaultOrientation, - const ChannelHandleAndGroup& handle_group); + const ChannelHandleAndGroup& handleGroup); ~PreviewDeck() override = default; }; diff --git a/src/mixer/sampler.cpp b/src/mixer/sampler.cpp index de03f37b718f..1531129ecb4c 100644 --- a/src/mixer/sampler.cpp +++ b/src/mixer/sampler.cpp @@ -8,14 +8,14 @@ Sampler::Sampler(QObject* pParent, EffectsManager* pEffectsManager, VisualsManager* pVisualsManager, EngineChannel::ChannelOrientation defaultOrientation, - const ChannelHandleAndGroup& handle_group) + const ChannelHandleAndGroup& handleGroup) : BaseTrackPlayerImpl(pParent, pConfig, pMixingEngine, pEffectsManager, pVisualsManager, defaultOrientation, - handle_group, + handleGroup, /*defaultMaster*/ true, /*defaultHeadphones*/ false, /*primaryDeck*/ false) { diff --git a/src/mixer/sampler.h b/src/mixer/sampler.h index d22b0419aac0..f17cbc4ccab4 100644 --- a/src/mixer/sampler.h +++ b/src/mixer/sampler.h @@ -11,6 +11,6 @@ class Sampler : public BaseTrackPlayerImpl { EffectsManager* pEffectsManager, VisualsManager* pVisualsManager, EngineChannel::ChannelOrientation defaultOrientation, - const ChannelHandleAndGroup& handle_group); + const ChannelHandleAndGroup& handleGroup); ~Sampler() override = default; };