From 4e1bebf0f5e06ecdd99c41771e7b4ee19c0cdcf3 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Tue, 17 Nov 2020 20:02:14 +0100 Subject: Pass non-trivial/large function args by reference Fixes a bunch of `-Wclazy-function-args-by-ref` warnings. See https://github.com/KDE/clazy/blob/master/docs/checks/README-function-args-by-ref.md for details. Most of these changes are automated, using the clazy fixit by setting the `CLAZY_EXPORT_FIXES` before compilation and then running: $ mkdir /tmp/patch $ find ../src -iname "*.yaml" -exec mv {} /tmp/patch \; $ clang-apply-replacements /tmp/patch --- src/engine/cachingreader/cachingreader.cpp | 2 +- src/engine/cachingreader/cachingreader.h | 6 +- src/engine/cachingreader/cachingreaderworker.cpp | 2 +- src/engine/cachingreader/cachingreaderworker.h | 4 +- src/engine/channels/engineaux.cpp | 8 +- src/engine/channels/engineaux.h | 9 +- src/engine/channels/enginedeck.cpp | 7 +- src/engine/channels/enginedeck.h | 9 +- src/engine/channels/enginemicrophone.cpp | 8 +- src/engine/channels/enginemicrophone.h | 9 +- src/engine/controls/bpmcontrol.cpp | 2 +- src/engine/controls/bpmcontrol.h | 2 +- src/engine/controls/clockcontrol.cpp | 2 +- src/engine/controls/clockcontrol.h | 4 +- src/engine/controls/cuecontrol.cpp | 8 +- src/engine/controls/cuecontrol.h | 10 +- src/engine/controls/enginecontrol.cpp | 4 +- src/engine/controls/enginecontrol.h | 4 +- src/engine/controls/keycontrol.cpp | 4 +- src/engine/controls/keycontrol.h | 2 +- src/engine/controls/loopingcontrol.cpp | 12 +- src/engine/controls/loopingcontrol.h | 8 +- src/engine/controls/quantizecontrol.cpp | 4 +- src/engine/controls/quantizecontrol.h | 2 +- src/engine/controls/ratecontrol.cpp | 14 +- src/engine/controls/ratecontrol.h | 282 +++++++++++------------ src/engine/controls/vinylcontrolcontrol.cpp | 2 +- src/engine/controls/vinylcontrolcontrol.h | 2 +- src/engine/enginebuffer.cpp | 2 +- src/engine/enginebuffer.h | 4 +- src/engine/enginedelay.cpp | 2 +- src/engine/enginedelay.h | 2 +- src/engine/enginemaster.cpp | 12 +- src/engine/enginemaster.h | 12 +- src/engine/enginepregain.cpp | 2 +- src/engine/enginepregain.h | 2 +- src/engine/enginevumeter.cpp | 2 +- src/engine/enginevumeter.h | 2 +- src/engine/positionscratchcontroller.cpp | 22 +- src/engine/positionscratchcontroller.h | 2 +- src/engine/sidechain/enginesidechain.cpp | 6 +- src/engine/sidechain/enginesidechain.h | 6 +- src/engine/sidechain/shoutconnection.cpp | 4 +- src/engine/sidechain/shoutconnection.h | 4 +- 44 files changed, 261 insertions(+), 257 deletions(-) (limited to 'src/engine') diff --git a/src/engine/cachingreader/cachingreader.cpp b/src/engine/cachingreader/cachingreader.cpp index d7332eb27c..592371a686 100644 --- a/src/engine/cachingreader/cachingreader.cpp +++ b/src/engine/cachingreader/cachingreader.cpp @@ -40,7 +40,7 @@ const SINT kNumberOfCachedChunksInMemory = 80; } // anonymous namespace -CachingReader::CachingReader(QString group, +CachingReader::CachingReader(const QString& group, UserSettingsPointer config) : m_pConfig(config), // Limit the number of in-flight requests to the worker. This should diff --git a/src/engine/cachingreader/cachingreader.h b/src/engine/cachingreader/cachingreader.h index 24b039f11e..01529342ea 100644 --- a/src/engine/cachingreader/cachingreader.h +++ b/src/engine/cachingreader/cachingreader.h @@ -75,8 +75,8 @@ class CachingReader : public QObject { public: // Construct a CachingReader with the given group. - CachingReader(QString group, - UserSettingsPointer _config); + CachingReader(const QString& group, + UserSettingsPointer _config); ~CachingReader() override; void process(); @@ -115,7 +115,7 @@ class CachingReader : public QObject { // Emitted once a new track is loaded and ready to be read from. void trackLoading(); void trackLoaded(TrackPointer pTrack, int iSampleRate, int iNumSamples); - void trackLoadFailed(TrackPointer pTrack, QString reason); + void trackLoadFailed(TrackPointer pTrack, const QString& reason); private: const UserSettingsPointer m_pConfig; diff --git a/src/engine/cachingreader/cachingreaderworker.cpp b/src/engine/cachingreader/cachingreaderworker.cpp index ae5b9d8256..aefd482d04 100644 --- a/src/engine/cachingreader/cachingreaderworker.cpp +++ b/src/engine/cachingreader/cachingreaderworker.cpp @@ -18,7 +18,7 @@ mixxx::Logger kLogger("CachingReaderWorker"); } // anonymous namespace CachingReaderWorker::CachingReaderWorker( - QString group, + const QString& group, FIFO* pChunkReadRequestFIFO, FIFO* pReaderStatusFIFO) : m_group(group), diff --git a/src/engine/cachingreader/cachingreaderworker.h b/src/engine/cachingreader/cachingreaderworker.h index eb0f68081c..6118c58c94 100644 --- a/src/engine/cachingreader/cachingreaderworker.h +++ b/src/engine/cachingreader/cachingreaderworker.h @@ -97,7 +97,7 @@ class CachingReaderWorker : public EngineWorker { public: // Construct a CachingReader with the given group. - CachingReaderWorker(QString group, + CachingReaderWorker(const QString& group, FIFO* pChunkReadRequestFIFO, FIFO* pReaderStatusFIFO); ~CachingReaderWorker() override = default; @@ -115,7 +115,7 @@ class CachingReaderWorker : public EngineWorker { // Emitted once a new track is loaded and ready to be read from. void trackLoading(); void trackLoaded(TrackPointer pTrack, int iSampleRate, int iNumSamples); - void trackLoadFailed(TrackPointer pTrack, QString reason); + void trackLoadFailed(TrackPointer pTrack, const QString& reason); private: const QString m_group; diff --git a/src/engine/channels/engineaux.cpp b/src/engine/channels/engineaux.cpp index eaaef154ae..9f75ec6d68 100644 --- a/src/engine/channels/engineaux.cpp +++ b/src/engine/channels/engineaux.cpp @@ -46,7 +46,7 @@ bool EngineAux::isActive() { return m_wasActive; } -void EngineAux::onInputConfigured(AudioInput input) { +void EngineAux::onInputConfigured(const AudioInput& input) { if (input.getType() != AudioPath::AUXILIARY) { // This is an error! qDebug() << "WARNING: EngineAux connected to AudioInput for a non-auxiliary type!"; @@ -56,7 +56,7 @@ void EngineAux::onInputConfigured(AudioInput input) { m_pInputConfigured->forceSet(1.0); } -void EngineAux::onInputUnconfigured(AudioInput input) { +void EngineAux::onInputUnconfigured(const AudioInput& input) { if (input.getType() != AudioPath::AUXILIARY) { // This is an error! qDebug() << "WARNING: EngineAux connected to AudioInput for a non-auxiliary type!"; @@ -66,8 +66,8 @@ void EngineAux::onInputUnconfigured(AudioInput input) { m_pInputConfigured->forceSet(0.0); } -void EngineAux::receiveBuffer(AudioInput input, const CSAMPLE* pBuffer, - unsigned int nFrames) { +void EngineAux::receiveBuffer( + const AudioInput& input, const CSAMPLE* pBuffer, unsigned int nFrames) { Q_UNUSED(input); Q_UNUSED(nFrames); m_sampleBuffer = pBuffer; diff --git a/src/engine/channels/engineaux.h b/src/engine/channels/engineaux.h index cf01a5aad3..d12f65ad8b 100644 --- a/src/engine/channels/engineaux.h +++ b/src/engine/channels/engineaux.h @@ -35,16 +35,17 @@ class EngineAux : public EngineChannel, public AudioDestination { // the soundcard this AudioDestination was registered for! Beware, in the // case of multiple soundcards, this method is not re-entrant but it may be // concurrent with EngineMaster processing. - virtual void receiveBuffer(AudioInput input, const CSAMPLE* pBuffer, - unsigned int nFrames); + virtual void receiveBuffer(const AudioInput& input, + const CSAMPLE* pBuffer, + unsigned int nFrames); // Called by SoundManager whenever the aux input is connected to a // soundcard input. - virtual void onInputConfigured(AudioInput input); + virtual void onInputConfigured(const AudioInput& input); // Called by SoundManager whenever the aux input is disconnected from // a soundcard input. - virtual void onInputUnconfigured(AudioInput input); + virtual void onInputUnconfigured(const AudioInput& input); private: QScopedPointer m_pInputConfigured; diff --git a/src/engine/channels/enginedeck.cpp b/src/engine/channels/enginedeck.cpp index 27431078c6..8eeb3d1bad 100644 --- a/src/engine/channels/enginedeck.cpp +++ b/src/engine/channels/enginedeck.cpp @@ -131,7 +131,8 @@ bool EngineDeck::isActive() { return active; } -void EngineDeck::receiveBuffer(AudioInput input, const CSAMPLE* pBuffer, unsigned int nFrames) { +void EngineDeck::receiveBuffer( + const AudioInput& input, const CSAMPLE* pBuffer, unsigned int nFrames) { Q_UNUSED(input); Q_UNUSED(nFrames); // Skip receiving audio input if passthrough is not active @@ -143,7 +144,7 @@ void EngineDeck::receiveBuffer(AudioInput input, const CSAMPLE* pBuffer, unsigne } } -void EngineDeck::onInputConfigured(AudioInput input) { +void EngineDeck::onInputConfigured(const AudioInput& input) { if (input.getType() != AudioPath::VINYLCONTROL) { // This is an error! qDebug() << "WARNING: EngineDeck connected to AudioInput for a non-vinylcontrol type!"; @@ -153,7 +154,7 @@ void EngineDeck::onInputConfigured(AudioInput input) { m_sampleBuffer = NULL; } -void EngineDeck::onInputUnconfigured(AudioInput input) { +void EngineDeck::onInputUnconfigured(const AudioInput& input) { if (input.getType() != AudioPath::VINYLCONTROL) { // This is an error! qDebug() << "WARNING: EngineDeck connected to AudioInput for a non-vinylcontrol type!"; diff --git a/src/engine/channels/enginedeck.h b/src/engine/channels/enginedeck.h index f571dadb38..cc0006c9c7 100644 --- a/src/engine/channels/enginedeck.h +++ b/src/engine/channels/enginedeck.h @@ -62,16 +62,17 @@ class EngineDeck : public EngineChannel, public AudioDestination { // the soundcard this AudioDestination was registered for! Beware, in the // case of multiple soundcards, this method is not re-entrant but it may be // concurrent with EngineMaster processing. - virtual void receiveBuffer(AudioInput input, const CSAMPLE* pBuffer, - unsigned int nFrames); + virtual void receiveBuffer(const AudioInput& input, + const CSAMPLE* pBuffer, + unsigned int nFrames); // Called by SoundManager whenever the passthrough input is connected to a // soundcard input. - virtual void onInputConfigured(AudioInput input); + virtual void onInputConfigured(const AudioInput& input); // Called by SoundManager whenever the passthrough input is disconnected // from a soundcard input. - virtual void onInputUnconfigured(AudioInput input); + virtual void onInputUnconfigured(const AudioInput& input); // Return whether or not passthrough is active bool isPassthroughActive() const; diff --git a/src/engine/channels/enginemicrophone.cpp b/src/engine/channels/enginemicrophone.cpp index be6e8c4174..ceefe6f5b1 100644 --- a/src/engine/channels/enginemicrophone.cpp +++ b/src/engine/channels/enginemicrophone.cpp @@ -43,7 +43,7 @@ bool EngineMicrophone::isActive() { return m_wasActive; } -void EngineMicrophone::onInputConfigured(AudioInput input) { +void EngineMicrophone::onInputConfigured(const AudioInput& input) { if (input.getType() != AudioPath::MICROPHONE) { // This is an error! qWarning() << "EngineMicrophone connected to AudioInput for a non-Microphone type!"; @@ -53,7 +53,7 @@ void EngineMicrophone::onInputConfigured(AudioInput input) { m_pInputConfigured->forceSet(1.0); } -void EngineMicrophone::onInputUnconfigured(AudioInput input) { +void EngineMicrophone::onInputUnconfigured(const AudioInput& input) { if (input.getType() != AudioPath::MICROPHONE) { // This is an error! qWarning() << "EngineMicrophone connected to AudioInput for a non-Microphone type!"; @@ -63,8 +63,8 @@ void EngineMicrophone::onInputUnconfigured(AudioInput input) { m_pInputConfigured->forceSet(0.0); } -void EngineMicrophone::receiveBuffer(AudioInput input, const CSAMPLE* pBuffer, - unsigned int nFrames) { +void EngineMicrophone::receiveBuffer( + const AudioInput& input, const CSAMPLE* pBuffer, unsigned int nFrames) { Q_UNUSED(input); Q_UNUSED(nFrames); m_sampleBuffer = pBuffer; diff --git a/src/engine/channels/enginemicrophone.h b/src/engine/channels/enginemicrophone.h index f3ac6f0b3e..0cca9c294c 100644 --- a/src/engine/channels/enginemicrophone.h +++ b/src/engine/channels/enginemicrophone.h @@ -38,16 +38,17 @@ class EngineMicrophone : public EngineChannel, public AudioDestination { // the soundcard this AudioDestination was registered for! Beware, in the // case of multiple soundcards, this method is not re-entrant but it may be // concurrent with EngineMaster processing. - virtual void receiveBuffer(AudioInput input, const CSAMPLE* pBuffer, - unsigned int iNumSamples); + virtual void receiveBuffer(const AudioInput& input, + const CSAMPLE* pBuffer, + unsigned int iNumSamples); // Called by SoundManager whenever the microphone input is connected to a // soundcard input. - virtual void onInputConfigured(AudioInput input); + virtual void onInputConfigured(const AudioInput& input); // Called by SoundManager whenever the microphone input is disconnected from // a soundcard input. - virtual void onInputUnconfigured(AudioInput input); + virtual void onInputUnconfigured(const AudioInput& input); bool isSolo(); double getSoloDamping(); diff --git a/src/engine/controls/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp index 20285ca89f..52370da16d 100644 --- a/src/engine/controls/bpmcontrol.cpp +++ b/src/engine/controls/bpmcontrol.cpp @@ -40,7 +40,7 @@ constexpr int kLocalBpmSpan = 4; constexpr SINT kSamplesPerFrame = 2; } -BpmControl::BpmControl(QString group, +BpmControl::BpmControl(const QString& group, UserSettingsPointer pConfig) : EngineControl(group, pConfig), m_tapFilter(this, kBpmTapFilterLength, kBpmTapMaxInterval), diff --git a/src/engine/controls/bpmcontrol.h b/src/engine/controls/bpmcontrol.h index c23716dd1a..fc753a2e80 100644 --- a/src/engine/controls/bpmcontrol.h +++ b/src/engine/controls/bpmcontrol.h @@ -23,7 +23,7 @@ class BpmControl : public EngineControl { Q_OBJECT public: - BpmControl(QString group, UserSettingsPointer pConfig); + BpmControl(const QString& group, UserSettingsPointer pConfig); ~BpmControl() override; double getBpm() const; diff --git a/src/engine/controls/clockcontrol.cpp b/src/engine/controls/clockcontrol.cpp index 2a374aa1b4..f48660bb4c 100644 --- a/src/engine/controls/clockcontrol.cpp +++ b/src/engine/controls/clockcontrol.cpp @@ -6,7 +6,7 @@ #include "preferences/usersettings.h" #include "track/track.h" -ClockControl::ClockControl(QString group, UserSettingsPointer pConfig) +ClockControl::ClockControl(const QString& group, UserSettingsPointer pConfig) : EngineControl(group, pConfig) { m_pCOBeatActive = new ControlObject(ConfigKey(group, "beat_active")); m_pCOBeatActive->set(0.0); diff --git a/src/engine/controls/clockcontrol.h b/src/engine/controls/clockcontrol.h index 719a13bd5d..5076a5cd9b 100644 --- a/src/engine/controls/clockcontrol.h +++ b/src/engine/controls/clockcontrol.h @@ -12,8 +12,8 @@ class ControlObject; class ClockControl: public EngineControl { Q_OBJECT public: - ClockControl(QString group, - UserSettingsPointer pConfig); + ClockControl(const QString& group, + UserSettingsPointer pConfig); ~ClockControl() override; diff --git a/src/engine/controls/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp index ab53d49e46..22a1ef74f9 100644 --- a/src/engine/controls/cuecontrol.cpp +++ b/src/engine/controls/cuecontrol.cpp @@ -46,7 +46,7 @@ inline mixxx::RgbColor::optional_t doubleToRgbColor(double value) { } // namespace -CueControl::CueControl(QString group, +CueControl::CueControl(const QString& group, UserSettingsPointer pConfig) : EngineControl(group, pConfig), m_pConfig(pConfig), @@ -316,7 +316,7 @@ void CueControl::createControls() { } } -void CueControl::attachCue(CuePointer pCue, HotcueControl* pControl) { +void CueControl::attachCue(const CuePointer& pCue, HotcueControl* pControl) { VERIFY_OR_DEBUG_ASSERT(pControl) { return; } @@ -1825,7 +1825,7 @@ ConfigKey HotcueControl::keyForControl(int hotcue, const char* name) { return key; } -HotcueControl::HotcueControl(QString group, int i) +HotcueControl::HotcueControl(const QString& group, int i) : m_group(group), m_iHotcueNumber(i), m_pCue(NULL), @@ -1960,7 +1960,7 @@ double HotcueControl::getPosition() const { return m_hotcuePosition->get(); } -void HotcueControl::setCue(CuePointer pCue) { +void HotcueControl::setCue(const CuePointer& pCue) { setPosition(pCue->getPosition()); setColor(pCue->getColor()); // set pCue only if all other data is in place diff --git a/src/engine/controls/cuecontrol.h b/src/engine/controls/cuecontrol.h index ee17926cf3..e954b82cda 100644 --- a/src/engine/controls/cuecontrol.h +++ b/src/engine/controls/cuecontrol.h @@ -43,13 +43,13 @@ inline SeekOnLoadMode seekOnLoadModeFromDouble(double value) { class HotcueControl : public QObject { Q_OBJECT public: - HotcueControl(QString group, int hotcueNumber); + HotcueControl(const QString& group, int hotcueNumber); ~HotcueControl() override; inline int getHotcueNumber() { return m_iHotcueNumber; } inline CuePointer getCue() { return m_pCue; } double getPosition() const; - void setCue(CuePointer pCue); + void setCue(const CuePointer& pCue); void resetCue(); void setPosition(double position); void setColor(mixxx::RgbColor::optional_t newColor); @@ -120,8 +120,8 @@ class HotcueControl : public QObject { class CueControl : public EngineControl { Q_OBJECT public: - CueControl(QString group, - UserSettingsPointer pConfig); + CueControl(const QString& group, + UserSettingsPointer pConfig); ~CueControl() override; void hintReader(HintVector* pHintList) override; @@ -188,7 +188,7 @@ class CueControl : public EngineControl { // These methods are not thread safe, only call them when the lock is held. void createControls(); - void attachCue(CuePointer pCue, HotcueControl* pControl); + void attachCue(const CuePointer& pCue, HotcueControl* pControl); void detachCue(HotcueControl* pControl); void loadCuesFromTrack(); double quantizeCuePoint(double position); diff --git a/src/engine/controls/enginecontrol.cpp b/src/engine/controls/enginecontrol.cpp index a5d0a0555f..22eaa2ab01 100644 --- a/src/engine/controls/enginecontrol.cpp +++ b/src/engine/controls/enginecontrol.cpp @@ -7,8 +7,8 @@ #include "engine/sync/enginesync.h" #include "mixer/playermanager.h" -EngineControl::EngineControl(QString group, - UserSettingsPointer pConfig) +EngineControl::EngineControl(const QString& group, + UserSettingsPointer pConfig) : m_group(group), m_pConfig(pConfig), m_pEngineMaster(nullptr), diff --git a/src/engine/controls/enginecontrol.h b/src/engine/controls/enginecontrol.h index d8c4de38b1..e4e00f8b35 100644 --- a/src/engine/controls/enginecontrol.h +++ b/src/engine/controls/enginecontrol.h @@ -38,8 +38,8 @@ const int kNoTrigger = -1; class EngineControl : public QObject { Q_OBJECT public: - EngineControl(QString group, - UserSettingsPointer pConfig); + EngineControl(const QString& group, + UserSettingsPointer pConfig); ~EngineControl() override; // Called by EngineBuffer::process every latency period. See the above diff --git a/src/engine/controls/keycontrol.cpp b/src/engine/controls/keycontrol.cpp index cc32cbcfac..8fac74c1fd 100644 --- a/src/engine/controls/keycontrol.cpp +++ b/src/engine/controls/keycontrol.cpp @@ -14,8 +14,8 @@ static const double kLockCurrentKey = 1; static const double kKeepUnlockedKey = 1; -KeyControl::KeyControl(QString group, - UserSettingsPointer pConfig) +KeyControl::KeyControl(const QString& group, + UserSettingsPointer pConfig) : EngineControl(group, pConfig) { m_pitchRateInfo.pitchRatio = 1.0; m_pitchRateInfo.tempoRatio = 1.0; diff --git a/src/engine/controls/keycontrol.h b/src/engine/controls/keycontrol.h index 622ae59f96..7835ce3033 100644 --- a/src/engine/controls/keycontrol.h +++ b/src/engine/controls/keycontrol.h @@ -26,7 +26,7 @@ class KeyControl : public EngineControl { bool keylock; }; - KeyControl(QString group, UserSettingsPointer pConfig); + KeyControl(const QString& group, UserSettingsPointer pConfig); ~KeyControl() override; // Returns a struct, with the results of the last pitch and tempo calculations diff --git a/src/engine/controls/loopingcontrol.cpp b/src/engine/controls/loopingcontrol.cpp index 0f3619d0e3..6888b821b3 100644 --- a/src/engine/controls/loopingcontrol.cpp +++ b/src/engine/controls/loopingcontrol.cpp @@ -21,7 +21,7 @@ double LoopingControl::s_dBeatSizes[] = { 0.03125, 0.0625, 0.125, 0.25, 0.5, // Used to generate the beatloop_%SIZE, beatjump_%SIZE, and loop_move_%SIZE CO // ConfigKeys. -ConfigKey keyForControl(QString group, QString ctrlName, double num) { +ConfigKey keyForControl(const QString& group, const QString& ctrlName, double num) { ConfigKey key; key.group = group; key.item = ctrlName.arg(num); @@ -37,8 +37,8 @@ QList LoopingControl::getBeatSizes() { return result; } -LoopingControl::LoopingControl(QString group, - UserSettingsPointer pConfig) +LoopingControl::LoopingControl(const QString& group, + UserSettingsPointer pConfig) : EngineControl(group, pConfig), m_bLoopingEnabled(false), m_bLoopRollActive(false), @@ -1305,7 +1305,7 @@ double LoopingControl::seekInsideAdjustedLoop( } } -BeatJumpControl::BeatJumpControl(QString group, double size) +BeatJumpControl::BeatJumpControl(const QString& group, double size) : m_dBeatJumpSize(size) { m_pJumpForward = new ControlPushButton( keyForControl(group, "beatjump_%1_forward", size)); @@ -1336,7 +1336,7 @@ void BeatJumpControl::slotJumpForward(double pressed) { } } -LoopMoveControl::LoopMoveControl(QString group, double size) +LoopMoveControl::LoopMoveControl(const QString& group, double size) : m_dLoopMoveSize(size) { m_pMoveForward = new ControlPushButton( keyForControl(group, "loop_move_%1_forward", size)); @@ -1367,7 +1367,7 @@ void LoopMoveControl::slotMoveForward(double v) { } } -BeatLoopingControl::BeatLoopingControl(QString group, double size) +BeatLoopingControl::BeatLoopingControl(const QString& group, double size) : m_dBeatLoopSize(size), m_bActive(false) { // This is the original beatloop control which is now deprecated. Its value diff --git a/src/engine/controls/loopingcontrol.h b/src/engine/controls/loopingcontrol.h index 3faaea34ea..45b20bc052 100644 --- a/src/engine/controls/loopingcontrol.h +++ b/src/engine/controls/loopingcontrol.h @@ -29,7 +29,7 @@ class LoopingControl : public EngineControl { public: static QList getBeatSizes(); - LoopingControl(QString group, UserSettingsPointer pConfig); + LoopingControl(const QString& group, UserSettingsPointer pConfig); ~LoopingControl() override; // process() updates the internal state of the LoopingControl to reflect the @@ -179,7 +179,7 @@ class LoopingControl : public EngineControl { class LoopMoveControl : public QObject { Q_OBJECT public: - LoopMoveControl(QString group, double size); + LoopMoveControl(const QString& group, double size); virtual ~LoopMoveControl(); signals: @@ -200,7 +200,7 @@ class LoopMoveControl : public QObject { class BeatJumpControl : public QObject { Q_OBJECT public: - BeatJumpControl(QString group, double size); + BeatJumpControl(const QString& group, double size); virtual ~BeatJumpControl(); signals: @@ -221,7 +221,7 @@ class BeatJumpControl : public QObject { class BeatLoopingControl : public QObject { Q_OBJECT public: - BeatLoopingControl(QString group, double size); + BeatLoopingControl(const QString& group, double size); virtual ~BeatLoopingControl(); void activate(); diff --git a/src/engine/controls/quantizecontrol.cpp b/src/engine/controls/quantizecontrol.cpp index e038e46b0a..28e70e274a 100644 --- a/src/engine/controls/quantizecontrol.cpp +++ b/src/engine/controls/quantizecontrol.cpp @@ -13,8 +13,8 @@ #include "track/track.h" #include "util/assert.h" -QuantizeControl::QuantizeControl(QString group, - UserSettingsPointer pConfig) +QuantizeControl::QuantizeControl(const QString& group, + UserSettingsPointer pConfig) : EngineControl(group, pConfig) { // Turn quantize OFF by default. See Bug #898213 m_pCOQuantizeEnabled = new ControlPushButton(ConfigKey(group, "quantize"), true); diff --git a/src/engine/controls/quantizecontrol.h b/src/engine/controls/quantizecontrol.h index b3bb56a627..03aae3fed5 100644 --- a/src/engine/controls/quantizecontrol.h +++ b/src/engine/controls/quantizecontrol.h @@ -14,7 +14,7 @@ class ControlPushButton; class QuantizeControl : public EngineControl { Q_OBJECT public: - QuantizeControl(QString group, UserSettingsPointer pConfig); + QuantizeControl(const QString& group, UserSettingsPointer pConfig); ~QuantizeControl() override; void setCurrentSample(const double dCurrentSample, diff --git a/src/engine/controls/ratecontrol.cpp b/src/engine/controls/ratecontrol.cpp index 221ac7bc58..99333b5b36 100644 --- a/src/engine/controls/ratecontrol.cpp +++ b/src/engine/controls/ratecontrol.cpp @@ -33,13 +33,13 @@ RateControl::RampMode RateControl::m_eRateRampMode; const double RateControl::kWheelMultiplier = 40.0; const double RateControl::kPausedJogMultiplier = 18.0; -RateControl::RateControl(QString group, - UserSettingsPointer pConfig) - : EngineControl(group, pConfig), - m_pBpmControl(NULL), - m_bTempStarted(false), - m_tempRateRatio(0.0), - m_dRateTempRampChange(0.0) { +RateControl::RateControl(const QString& group, + UserSettingsPointer pConfig) + : EngineControl(group, pConfig), + m_pBpmControl(NULL), + m_bTempStarted(false), + m_tempRateRatio(0.0), + m_dRateTempRampChange(0.0) { m_pScratchController = new PositionScratchController(group); // This is the resulting rate ratio that can be used for display or calculations. diff --git a/src/engine/controls/ratecontrol.h b/src/engine/controls/ratecontrol.h index 6740f3b241..6daa7296ce 100644 --- a/src/engine/controls/ratecontrol.h +++ b/src/engine/controls/ratecontrol.h @@ -26,147 +26,147 @@ class PositionScratchController; class RateControl : public EngineControl { Q_OBJECT public: - RateControl(QString group, UserSettingsPointer pConfig); - ~RateControl() override; - - // Enumerations which hold the state of the pitchbend buttons. - // These enumerations can be used like a bitmask. - enum class RampDirection { - None, // No buttons are held down - Down, // Down button is being held - Up, // Up button is being held - DownSmall, // DownSmall button is being held - UpSmall, // UpSmall button is being held - }; - - enum class RampMode { - Stepping = 0, // pitch takes a temporary step up/down a certain amount - Linear = 1 // pitch moves up/down in a progressively linear fashion - }; - - void setBpmControl(BpmControl* bpmcontrol); - - // Returns the current engine rate. "reportScratching" is used to tell - // the caller that the user is currently scratching, and this is used to - // disable keylock. - double calculateSpeed( - double baserate, - double speed, - bool paused, - int iSamplesPerBuffer, - bool* pReportScratching, - bool* pReportReverse); - - // Set rate change when temp rate button is pressed - static void setTemporaryRateChangeCoarseAmount(double v); - static double getTemporaryRateChangeCoarseAmount(); - // Set rate change when temp rate small button is pressed - static void setTemporaryRateChangeFineAmount(double v); - static double getTemporaryRateChangeFineAmount(); - // Set rate change when perm rate button is pressed - static void setPermanentRateChangeCoarseAmount(double v); - static double getPermanentRateChangeCoarseAmount(); - // Set rate change when perm rate small button is pressed - static void setPermanentRateChangeFineAmount(double v); - static double getPermanentRateChangeFineAmount(); - // Set Rate Ramp Mode - static void setRateRampMode(RampMode mode); - static RampMode getRateRampMode(); - // Set Rate Ramp Sensitivity - static void setRateRampSensitivity(int); - static int getRateRampSensitivity(); - void notifySeek(double dNewPlaypos) override; - bool isReverseButtonPressed(); - - public slots: - void slotRateRangeChanged(double); - void slotRateSliderChanged(double); - void slotRateRatioChanged(double); - void slotReverseRollActivate(double); - void slotControlRatePermDown(double); - void slotControlRatePermDownSmall(double); - void slotControlRatePermUp(double); - void slotControlRatePermUpSmall(double); - void slotControlFastForward(double); - void slotControlFastBack(double); - - private: - void processTempRate(const int bufferSamples); - double getJogFactor() const; - double getWheelFactor() const; - SyncMode getSyncMode() const; - - // Set rate change of the temporary pitch rate - void setRateTemp(double v); - // Add a value to the temporary pitch rate - void addRateTemp(double v); - // Subtract a value from the temporary pitch rate - void subRateTemp(double v); - // Reset the temporary pitch rate - void resetRateTemp(void); - // Get the 'Raw' Temp Rate - double getTempRate(void); - - // Values used when temp and perm rate buttons are pressed - static ControlValueAtomic m_dTemporaryRateChangeCoarse; - static ControlValueAtomic m_dTemporaryRateChangeFine; - static ControlValueAtomic m_dPermanentRateChangeCoarse; - static ControlValueAtomic m_dPermanentRateChangeFine; - - ControlPushButton* m_pButtonRateTempDown; - ControlPushButton* m_pButtonRateTempDownSmall; - ControlPushButton* m_pButtonRateTempUp; - ControlPushButton* m_pButtonRateTempUpSmall; - - ControlPushButton* m_pButtonRatePermDown; - ControlPushButton* m_pButtonRatePermDownSmall; - ControlPushButton* m_pButtonRatePermUp; - ControlPushButton* m_pButtonRatePermUpSmall; - - ControlObject* m_pRateRatio; - ControlObject* m_pRateDir; - ControlObject* m_pRateRange; - ControlPotmeter* m_pRateSlider; - ControlPotmeter* m_pRateSearch; - ControlPushButton* m_pReverseButton; - ControlPushButton* m_pReverseRollButton; - ControlObject* m_pBackButton; - ControlObject* m_pForwardButton; - - ControlTTRotary* m_pWheel; - ControlObject* m_pScratch2; - PositionScratchController* m_pScratchController; - - ControlPushButton* m_pScratch2Enable; - ControlObject* m_pJog; - ControlObject* m_pVCEnabled; - ControlObject* m_pVCScratching; - ControlObject* m_pVCMode; - ControlObject* m_pScratch2Scratching; - Rotary* m_pJogFilter; - - ControlObject* m_pSampleRate; - - // For Master Sync - BpmControl* m_pBpmControl; - - ControlProxy* m_pSyncMode; - ControlProxy* m_pSlipEnabled; - - // This is true if we've already started to ramp the rate - bool m_bTempStarted; - // Set the Temporary Rate Change Mode - static RampMode m_eRateRampMode; - // The Rate Temp Sensitivity, the higher it is the slower it gets - static int m_iRateRampSensitivity; - // Factor applied to the deprecated "wheel" rate value. - static const double kWheelMultiplier; - // Factor applied to jogwheels when the track is paused to speed up seeking. - static const double kPausedJogMultiplier; - // Temporary pitchrate, added to the permanent rate for calculateRate - double m_tempRateRatio; - // Speed for temporary rate change - double m_dRateTempRampChange; + RateControl(const QString& group, UserSettingsPointer pConfig); + ~RateControl() override; + + // Enumerations which hold the state of the pitchbend buttons. + // These enumerations can be used like a bitmask. + enum class RampDirection { + None, // No buttons are held down + Down, // Down button is being held + Up, // Up button is being held + DownSmall, // DownSmall button is being held + UpSmall, // UpSmall button is being held + }; + + enum class RampMode { + Stepping = 0, // pitch takes a temporary step up/down a certain amount + Linear = 1 // pitch moves up/down in a progressively linear fashion + }; + + void setBpmControl(BpmControl* bpmcontrol); + + // Returns the current engine rate. "reportScratching" is used to tell + // the caller that the user is currently scratching, and this is used to + // disable keylock. + double calculateSpeed( + double baserate, + double speed, + bool paused, + int iSamplesPerBuffer, + bool* pReportScratching, + bool* pReportReverse); + + // Set rate change when temp rate button is pressed + static void setTemporaryRateChangeCoarseAmount(double v); + static double getTemporaryRateChangeCoarseAmount(); + // Set rate change when temp rate small button is pressed + static void setTemporaryRateChangeFineAmount(double v); + static double getTemporaryRateChangeFineAmount(); + // Set rate change when perm rate button is pressed + static void setPermanentRateChangeCoarseAmount(double v); + static double getPermanentRateChangeCoarseAmount(); + // Set rate change when perm rate small button is pressed + static void setPermanentRateChangeFineAmount(double v); + static double getPermanentRateChangeFineAmount(); + // Set Rate Ramp Mode + static void setRateRampMode(RampMode mode); + static RampMode getRateRampMode(); + // Set Rate Ramp Sensitivity + static void setRateRampSensitivity(int); + static int getRateRampSensitivity(); + void notifySeek(double dNewPlaypos) override; + bool isReverseButtonPressed(); + +public slots: + void slotRateRangeChanged(double); + void slotRateSliderChanged(double); + void slotRateRatioChanged(double); + void slotReverseRollActivate(double); + void slotControlRatePermDown(double); + void slotControlRatePermDownSmall(double); + void slotControlRatePermUp(double); + void slotControlRatePermUpSmall(double); + void slotControlFastForward(double); + void slotControlFastBack(double); + +private: + void processTempRate(const int bufferSamples); + double getJogFactor() const; + double getWheelFactor() const; + SyncMode getSyncMode() const; + + // Set rate change of the temporary pitch rate + void setRateTemp(double v); + // Add a value to the temporary pitch rate + void addRateTemp(double v); + // Subtract a value from the temporary pitch rate + void subRateTemp(double v); + // Reset the temporary pitch rate + void resetRateTemp(void); + // Get the 'Raw' Temp Rate + double getTempRate(void); + + // Values used when temp and perm rate buttons are pressed + static ControlValueAtomic m_dTemporaryRateChangeCoarse; + static ControlValueAtomic m_dTemporaryRateChangeFine; + static ControlValueAtomic m_dPermanentRateChangeCoarse; + static ControlValueAtomic m_dPermanentRateChangeFine; + + ControlPushButton* m_pButtonRateTempDown; + ControlPushButton* m_pButtonRateTempDownSmall; + ControlPushButton* m_pButtonRateTempUp; + ControlPushButton* m_pButtonRateTempUpSmall; + + ControlPushButton* m_pButtonRatePermDown; + ControlPushButton* m_pButtonRatePermDownSmall; + ControlPushButton* m_pButtonRatePermUp; + ControlPushButton* m_pButtonRatePermUpSmall; + + ControlObject* m_pRateRatio; + ControlObject* m_pRateDir; + ControlObject* m_pRateRange; + ControlPotmeter* m_pRateSlider; + ControlPotmeter* m_pRateSearch; + ControlPushButton* m_pReverseButton; + ControlPushButton* m_pReverseRollButton; + ControlObject* m_pBackButton; + ControlObject* m_pForwardButton; + + ControlTTRotary* m_pWheel; + ControlObject* m_pScratch2; + PositionScratchController* m_pScratchController; + + ControlPushButton* m_pScratch2Enable; + ControlObject* m_pJog; + ControlObject* m_pVCEnabled; + ControlObject* m_pVCScratching; + ControlObject* m_pVCMode; + ControlObject* m_pScratch2Scratching; + Rotary* m_pJogFilter; + + ControlObject* m_pSampleRate; + + // For Master Sync + BpmControl* m_pBpmControl; + + ControlProxy* m_pSyncMode; + ControlProxy* m_pSlipEnabled; + + // This is true if we've already started to ramp the rate + bool m_bTempStarted; + // Set the Temporary Rate Change Mode + static RampMode m_eRateRampMode; + // The Rate Temp Sensitivity, the higher it is the slower it gets + static int m_iRateRampSensitivity; + // Factor applied to the deprecated "wheel" rate value. + static const double kWheelMultiplier; + // Factor applied to jogwheels when the track is paused to speed up seeking. + static const double kPausedJogMultiplier; + // Temporary pitchrate, added to the permanent rate for calculateRate + double m_tempRateRatio; + // Speed for temporary rate change + double m_dRateTempRampChange; }; #endif /* RATECONTROL_H */ diff --git a/src/engine/controls/vinylcontrolcontrol.cpp b/src/engine/controls/vinylcontrolcontrol.cpp index f0b9ed5de1..951552d44a 100644 --- a/src/engine/controls/vinylcontrolcontrol.cpp +++ b/src/engine/controls/vinylcontrolcontrol.cpp @@ -4,7 +4,7 @@ #include "util/math.h" #include "vinylcontrol/vinylcontrol.h" -VinylControlControl::VinylControlControl(QString group, UserSettingsPointer pConfig) +VinylControlControl::VinylControlControl(const QString& group, UserSettingsPointer pConfig) : EngineControl(group, pConfig), m_bSeekRequested(false) { m_pControlVinylStatus = new ControlObject(ConfigKey(group, "vinylcontrol_status")); diff --git a/src/engine/controls/vinylcontrolcontrol.h b/src/engine/controls/vinylcontrolcontrol.h index 9129337a13..6e684fa57c 100644 --- a/src/engine/controls/vinylcontrolcontrol.h +++ b/src/engine/controls/vinylcontrolcontrol.h @@ -11,7 +11,7 @@ class VinylControlControl : public EngineControl { Q_OBJECT public: - VinylControlControl(QString group, UserSettingsPointer pConfig); + VinylControlControl(const QString& group, UserSettingsPointer pConfig); virtual ~VinylControlControl(); // If the engine asks for a seek, we may need to disable absolute mode. diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp index 5f70a75f68..36be2816b5 100644 --- a/src/engine/enginebuffer.cpp +++ b/src/engine/enginebuffer.cpp @@ -533,7 +533,7 @@ void EngineBuffer::slotTrackLoaded(TrackPointer pTrack, // WARNING: Always called from the EngineWorker thread pool void EngineBuffer::slotTrackLoadFailed(TrackPointer pTrack, - QString reason) { + const QString& reason) { m_iTrackLoading = 0; // Loading of a new track failed. // eject the currently loaded track (the old Track) as well diff --git a/src/engine/enginebuffer.h b/src/engine/enginebuffer.h index 3f9242c4fd..a3c4deda35 100644 --- a/src/engine/enginebuffer.h +++ b/src/engine/enginebuffer.h @@ -199,14 +199,14 @@ class EngineBuffer : public EngineObject { signals: void trackLoaded(TrackPointer pNewTrack, TrackPointer pOldTrack); - void trackLoadFailed(TrackPointer pTrack, QString reason); + void trackLoadFailed(TrackPointer pTrack, const QString& reason); private slots: void slotTrackLoading(); void slotTrackLoaded(TrackPointer pTrack, int iSampleRate, int iNumSamples); void slotTrackLoadFailed(TrackPointer pTrack, - QString reason); + const QString& reason); // Fired when passthrough mode is enabled or disabled. void slotPassthroughChanged(double v); void slotUpdatedTrackBeats(); diff --git a/src/engine/enginedelay.cpp b/src/engine/enginedelay.cpp index 1947dfc14d..7a44c3bd24 100644 --- a/src/engine/enginedelay.cpp +++ b/src/engine/enginedelay.cpp @@ -28,7 +28,7 @@ const int kiMaxDelay = static_cast((kdMaxDelayPot + 8) / 1000 * mixxx::audio::SampleRate::kValueMax * mixxx::kEngineChannelCount); } // anonymous namespace -EngineDelay::EngineDelay(const QString& group, ConfigKey delayControl, bool bPersist) +EngineDelay::EngineDelay(const QString& group, const ConfigKey& delayControl, bool bPersist) : m_iDelayPos(0), m_iDelay(0) { m_pDelayBuffer = SampleUtil::alloc(kiMaxDelay); diff --git a/src/engine/enginedelay.h b/src/engine/enginedelay.h index 5f2d16f689..60654cb4ca 100644 --- a/src/engine/enginedelay.h +++ b/src/engine/enginedelay.h @@ -26,7 +26,7 @@ class ControlProxy; class EngineDelay : public EngineObject { Q_OBJECT public: - EngineDelay(const QString& group, ConfigKey delayControl, bool bPersist = true); + EngineDelay(const QString& group, const ConfigKey& delayControl, bool bPersist = true); virtual ~EngineDelay(); void process(CSAMPLE* pInOut, const int iBufferSize); diff --git a/src/engine/enginemaster.cpp b/src/engine/enginemaster.cpp index ee2e5ebb47..9e49dc18de 100644 --- a/src/engine/enginemaster.cpp +++ b/src/engine/enginemaster.cpp @@ -847,7 +847,7 @@ const CSAMPLE* EngineMaster::getOutputBusBuffer(unsigned int i) const { return NULL; } -const CSAMPLE* EngineMaster::getChannelBuffer(QString group) const { +const CSAMPLE* EngineMaster::getChannelBuffer(const QString& group) const { for (int i = 0; i < m_channels.size(); ++i) { const ChannelInfo* pChannelInfo = m_channels[i]; if (pChannelInfo->m_pChannel->getGroup() == group) { @@ -857,7 +857,7 @@ const CSAMPLE* EngineMaster::getChannelBuffer(QString group) const { return NULL; } -const CSAMPLE* EngineMaster::buffer(AudioOutput output) const { +const CSAMPLE* EngineMaster::buffer(const AudioOutput& output) const { switch (output.getType()) { case AudioOutput::MASTER: return getMasterBuffer(); @@ -882,7 +882,7 @@ const CSAMPLE* EngineMaster::buffer(AudioOutput output) const { } } -void EngineMaster::onOutputConnected(AudioOutput output) { +void EngineMaster::onOutputConnected(const AudioOutput& output) { switch (output.getType()) { case AudioOutput::MASTER: // overwrite config option if a master output is configured @@ -910,7 +910,7 @@ void EngineMaster::onOutputConnected(AudioOutput output) { } } -void EngineMaster::onOutputDisconnected(AudioOutput output) { +void EngineMaster::onOutputDisconnected(const AudioOutput& output) { switch (output.getType()) { case AudioOutput::MASTER: // not used, because we need the master buffer for headphone mix @@ -936,7 +936,7 @@ void EngineMaster::onOutputDisconnected(AudioOutput output) { } } -void EngineMaster::onInputConnected(AudioInput input) { +void EngineMaster::onInputConnected(const AudioInput& input) { switch (input.getType()) { case AudioInput::MICROPHONE: m_pNumMicsConfigured->set(m_pNumMicsConfigured->get() + 1); @@ -955,7 +955,7 @@ void EngineMaster::onInputConnected(AudioInput input) { } } -void EngineMaster::onInputDisconnected(AudioInput input) { +void EngineMaster::onInputDisconnected(const AudioInput& input) { switch (input.getType()) { case AudioInput::MICROPHONE: m_pNumMicsConfigured->set(m_pNumMicsConfigured->get() - 1); diff --git a/src/engine/enginemaster.h b/src/engine/enginemaster.h index 9bcdffc0ea..20beb81685 100644 --- a/src/engine/enginemaster.h +++ b/src/engine/enginemaster.h @@ -64,7 +64,7 @@ class EngineMaster : public QObject, public AudioSource { // Get access to the sample buffers. None of these are thread safe. Only to // be called by SoundManager. - const CSAMPLE* buffer(AudioOutput output) const; + const CSAMPLE* buffer(const AudioOutput& output) const; ChannelHandleAndGroup registerChannelGroup(const QString& group) { return ChannelHandleAndGroup( @@ -79,10 +79,10 @@ class EngineMaster : public QObject, public AudioSource { // these methods are called the callback is guaranteed to be inactive // (SoundManager closes all devices before calling these). This may change // in the future. - virtual void onOutputConnected(AudioOutput output); - virtual void onOutputDisconnected(AudioOutput output); - void onInputConnected(AudioInput input); - void onInputDisconnected(AudioInput input); + virtual void onOutputConnected(const AudioOutput& output); + virtual void onOutputDisconnected(const AudioOutput& output); + void onInputConnected(const AudioInput& input); + void onInputDisconnected(const AudioInput& input); void process(const int iBufferSize); @@ -116,7 +116,7 @@ class EngineMaster : public QObject, public AudioSource { const CSAMPLE* getHeadphoneBuffer() const; const CSAMPLE* getOutputBusBuffer(unsigned int i) const; const CSAMPLE* getDeckBuffer(unsigned int i) const; - const CSAMPLE* getChannelBuffer(QString name) const; + const CSAMPLE* getChannelBuffer(const QString& name) const; const CSAMPLE* getSidechainBuffer() const; EngineSideChain* getSideChain() const { diff --git a/src/engine/enginepregain.cpp b/src/engine/enginepregain.cpp index 7a256b26d8..443ca048d0 100644 --- a/src/engine/enginepregain.cpp +++ b/src/engine/enginepregain.cpp @@ -24,7 +24,7 @@ ControlPotmeter* EnginePregain::s_pReplayGainBoost = NULL; ControlPotmeter* EnginePregain::s_pDefaultBoost = NULL; ControlObject* EnginePregain::s_pEnableReplayGain = NULL; -EnginePregain::EnginePregain(QString group) +EnginePregain::EnginePregain(const QString& group) : m_dSpeed(1.0), m_dOldSpeed(1.0), m_dNonScratchSpeed(1.0), diff --git a/src/engine/enginepregain.h b/src/engine/enginepregain.h index 6248b40261..2d5b1b50f8 100644 --- a/src/engine/enginepregain.h +++ b/src/engine/enginepregain.h @@ -13,7 +13,7 @@ class ControlObject; // adjustments in volume relative to playback speed. class EnginePregain : public EngineObject { public: - EnginePregain(QString group); + EnginePregain(const QString& group); ~EnginePregain() override; // If the user is scratching and the record reverses direction, the volume diff --git a/src/engine/enginevumeter.cpp b/src/engine/enginevumeter.cpp index f039289548..666ea72f5d 100644 --- a/src/engine/enginevumeter.cpp +++ b/src/engine/enginevumeter.cpp @@ -18,7 +18,7 @@ constexpr CSAMPLE kDecaySmoothing = 0.1f; //.16//.4 } // namespace -EngineVuMeter::EngineVuMeter(QString group) { +EngineVuMeter::EngineVuMeter(const QString& group) { // The VUmeter widget is controlled via a controlpotmeter, which means // that it should react on the setValue(int) signal. m_ctrlVuMeter = new ControlPotmeter(ConfigKey(group, "VuMeter"), 0., 1.); diff --git a/src/engine/enginevumeter.h b/src/engine/enginevumeter.h index a39da1bcc1..a1a94b75d1 100644 --- a/src/engine/enginevumeter.h +++ b/src/engine/enginevumeter.h @@ -8,7 +8,7 @@ class ControlProxy; class EngineVuMeter : public EngineObject { Q_OBJECT public: - EngineVuMeter(QString group); + EngineVuMeter(const QString& group); virtual ~EngineVuMeter(); virtual void process(CSAMPLE* pInOut, const int iBufferSize); diff --git a/src/engine/positionscratchcontroller.cpp b/src/engine/positionscratchcontroller.cpp index cb7a93e61d..cba4a28bbd 100644 --- a/src/engine/positionscratchcontroller.cpp +++ b/src/engine/positionscratchcontroller.cpp @@ -62,17 +62,17 @@ class RateIIFilter { double m_last_rate; }; -PositionScratchController::PositionScratchController(QString group) - : m_group(group), - m_bScratching(false), - m_bEnableInertia(false), - m_dLastPlaypos(0), - m_dPositionDeltaSum(0), - m_dTargetDelta(0), - m_dStartScratchPosition(0), - m_dRate(0), - m_dMoveDelay(0), - m_dMouseSampeTime(0) { +PositionScratchController::PositionScratchController(const QString& group) + : m_group(group), + m_bScratching(false), + m_bEnableInertia(false), + m_dLastPlaypos(0), + m_dPositionDeltaSum(0), + m_dTargetDelta(0), + m_dStartScratchPosition(0), + m_dRate(0), + m_dMoveDelay(0), + m_dMouseSampeTime(0) { m_pScratchEnable = new ControlObject(ConfigKey(group, "scratch_position_enable")); m_pScratchPosition = new ControlObject(ConfigKey(group, "scratch_position")); m_pMasterSampleRate = ControlObject::getControl(ConfigKey("[Master]", "samplerate")); diff --git a/src/engine/positionscratchcontroller.h b/src/engine/positionscratchcontroller.h index 55ab0d3eda..ace908d1e7 100644 --- a/src/engine/positionscratchcontroller.h +++ b/src/engine/positionscratchcontroller.h @@ -11,7 +11,7 @@ class RateIIFilter; class PositionScratchController : public QObject { public: - PositionScratchController(QString group); + PositionScratchController(const QString& group); virtual ~PositionScratchController(); void process(double currentSample, double releaseRate, diff --git a/src/engine/sidechain/enginesidechain.cpp b/src/engine/sidechain/enginesidechain.cpp index fe9c562641..2e095de393 100644 --- a/src/engine/sidechain/enginesidechain.cpp +++ b/src/engine/sidechain/enginesidechain.cpp @@ -79,9 +79,9 @@ void EngineSideChain::addSideChainWorker(SideChainWorker* pWorker) { m_workers.append(pWorker); } -void EngineSideChain::receiveBuffer(AudioInput input, - const CSAMPLE* pBuffer, - unsigned int iFrames) { +void EngineSideChain::receiveBuffer(const AudioInput& input, + const CSAMPLE* pBuffer, + unsigned int iFrames) { VERIFY_OR_DEBUG_ASSERT(input.getType() == AudioInput::RECORD_BROADCAST) { qDebug() << "WARNING: AudioInput type is not RECORD_BROADCAST. Ignoring incoming buffer."; return; diff --git a/src/engine/sidechain/enginesidechain.h b/src/engine/sidechain/enginesidechain.h index 91a0cfd8a3..2278bbf882 100644 --- a/src/engine/sidechain/enginesidechain.h +++ b/src/engine/sidechain/enginesidechain.h @@ -42,9 +42,9 @@ class EngineSideChain : public QThread, public AudioDestination { // Thin wrapper around writeSamples that is used by SoundManager when receiving // from a sound card input instead of the engine - void receiveBuffer(AudioInput input, - const CSAMPLE* pBuffer, - unsigned int iFrames) override; + void receiveBuffer(const AudioInput& input, + const CSAMPLE* pBuffer, + unsigned int iFrames) override; // Thread-safe, blocking. void addSideChainWorker(SideChainWorker* pWorker); diff --git a/src/engine/sidechain/shoutconnection.cpp b/src/engine/sidechain/shoutconnection.cpp index ca436ad17c..a9f400af35 100644 --- a/src/engine/sidechain/shoutconnection.cpp +++ b/src/engine/sidechain/shoutconnection.cpp @@ -865,7 +865,7 @@ void ShoutConnection::updateMetaData() { } } -void ShoutConnection::errorDialog(QString text, QString detailedError) { +void ShoutConnection::errorDialog(const QString& text, const QString& detailedError) { qWarning() << "Streaming error: " << detailedError; ErrorDialogProperties* props = ErrorDialogHandler::instance()->newDialogProperties(); props->setType(DLG_WARNING); @@ -881,7 +881,7 @@ void ShoutConnection::errorDialog(QString text, QString detailedError) { setState(NETWORKSTREAMWORKER_STATE_ERROR); } -void ShoutConnection::infoDialog(QString text, QString detailedInfo) { +void ShoutConnection::infoDialog(const QString& text, const QString& detailedInfo) { ErrorDialogProperties* props = ErrorDialogHandler::instance()->newDialogProperties(); props->setType(DLG_INFO); props->setTitle(tr("Connection message")); diff --git a/src/engine/sidechain/shoutconnection.h b/src/engine/sidechain/shoutconnection.h index 5147515669..7ffa155e3c 100644 --- a/src/engine/sidechain/shoutconnection.h +++ b/src/engine/sidechain/shoutconnection.h @@ -100,8 +100,8 @@ class ShoutConnection void updateMetaData(); // Common error dialog creation code for run-time exceptions. Notify user // when connected or disconnected and so on - void errorDialog(QString text, QString detailedError); - void infoDialog(QString text, QString detailedError); + void errorDialog(const QString& text, const QString& detailedError); + void infoDialog(const QString& text, const QString& detailedError); void serverWrite(unsigned char *header, unsigned char *body, int headerLen, int bodyLen); -- cgit v1.2.3