diff --git a/src/engine/channels/engineaux.h b/src/engine/channels/engineaux.h index 5934ca5fec02..72a171035c6c 100644 --- a/src/engine/channels/engineaux.h +++ b/src/engine/channels/engineaux.h @@ -16,31 +16,33 @@ class EngineAux : public EngineChannel, public AudioDestination { Q_OBJECT public: EngineAux(const ChannelHandleAndGroup& handleGroup, EffectsManager* pEffectsManager); - virtual ~EngineAux(); + ~EngineAux() override; ActiveState updateActiveState() override; /// Called by EngineMaster whenever is requesting a new buffer of audio. - virtual void process(CSAMPLE* pOutput, const int iBufferSize); - virtual void collectFeatures(GroupFeatureState* pGroupFeatures) const; - virtual void postProcess(const int iBufferSize) { Q_UNUSED(iBufferSize) } + void process(CSAMPLE* pOutput, const int iBufferSize) override; + void collectFeatures(GroupFeatureState* pGroupFeatures) const override; + void postProcess(const int iBufferSize) override { + Q_UNUSED(iBufferSize) + } /// This is called by SoundManager whenever there are new samples from the /// configured input to be processed. This is run in the callback thread of /// 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(const AudioInput& input, + void receiveBuffer(const AudioInput& input, const CSAMPLE* pBuffer, - unsigned int nFrames); + unsigned int nFrames) override; /// Called by SoundManager whenever the aux input is connected to a /// soundcard input. - virtual void onInputConfigured(const AudioInput& input); + void onInputConfigured(const AudioInput& input) override; /// Called by SoundManager whenever the aux input is disconnected from /// a soundcard input. - virtual void onInputUnconfigured(const AudioInput& input); + void onInputUnconfigured(const AudioInput& input) override; private: QScopedPointer m_pInputConfigured; diff --git a/src/engine/channels/enginechannel.h b/src/engine/channels/enginechannel.h index 6ea7c910406c..2f832201f6f2 100644 --- a/src/engine/channels/enginechannel.h +++ b/src/engine/channels/enginechannel.h @@ -32,7 +32,7 @@ class EngineChannel : public EngineObject { EffectsManager* pEffectsManager, bool isTalkoverChannel, bool isPrimaryDeck); - virtual ~EngineChannel(); + ~EngineChannel() override; virtual ChannelOrientation getOrientation() const; @@ -72,7 +72,7 @@ class EngineChannel : public EngineObject { // TODO(XXX) This hack needs to be removed. virtual EngineBuffer* getEngineBuffer() { - return NULL; + return nullptr; } protected: diff --git a/src/engine/channels/enginedeck.h b/src/engine/channels/enginedeck.h index 50f61ec86227..3bdb13abcb41 100644 --- a/src/engine/channels/enginedeck.h +++ b/src/engine/channels/enginedeck.h @@ -29,14 +29,14 @@ class EngineDeck : public EngineChannel, public AudioDestination { EffectsManager* pEffectsManager, EngineChannel::ChannelOrientation defaultOrientation, bool primaryDeck); - virtual ~EngineDeck(); + ~EngineDeck() override; - virtual void process(CSAMPLE* pOutput, const int iBufferSize); - virtual void collectFeatures(GroupFeatureState* pGroupFeatures) const; - virtual void postProcess(const int iBufferSize); + void process(CSAMPLE* pOutput, const int iBufferSize) override; + void collectFeatures(GroupFeatureState* pGroupFeatures) const override; + void postProcess(const int iBufferSize) override; // TODO(XXX) This hack needs to be removed. - virtual EngineBuffer* getEngineBuffer(); + EngineBuffer* getEngineBuffer() override; EngineChannel::ActiveState updateActiveState() override; @@ -45,17 +45,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(const AudioInput& input, + void receiveBuffer(const AudioInput& input, const CSAMPLE* pBuffer, - unsigned int nFrames); + unsigned int nFrames) override; // Called by SoundManager whenever the passthrough input is connected to a // soundcard input. - virtual void onInputConfigured(const AudioInput& input); + void onInputConfigured(const AudioInput& input) override; // Called by SoundManager whenever the passthrough input is disconnected // from a soundcard input. - virtual void onInputUnconfigured(const AudioInput& input); + void onInputUnconfigured(const AudioInput& input) override; // Return whether or not passthrough is active bool isPassthroughActive() const; diff --git a/src/engine/channels/enginemicrophone.h b/src/engine/channels/enginemicrophone.h index 789be15cf136..8133344ef6fc 100644 --- a/src/engine/channels/enginemicrophone.h +++ b/src/engine/channels/enginemicrophone.h @@ -20,31 +20,33 @@ class EngineMicrophone : public EngineChannel, public AudioDestination { public: EngineMicrophone(const ChannelHandleAndGroup& handleGroup, EffectsManager* pEffectsManager); - virtual ~EngineMicrophone(); + ~EngineMicrophone() override; ActiveState updateActiveState(); // Called by EngineMaster whenever is requesting a new buffer of audio. - virtual void process(CSAMPLE* pOutput, const int iBufferSize); - virtual void collectFeatures(GroupFeatureState* pGroupFeatures) const; - virtual void postProcess(const int iBufferSize) { Q_UNUSED(iBufferSize) } + void process(CSAMPLE* pOutput, const int iBufferSize) override; + void collectFeatures(GroupFeatureState* pGroupFeatures) const override; + void postProcess(const int iBufferSize) override { + Q_UNUSED(iBufferSize) + } // This is called by SoundManager whenever there are new samples from the // configured input to be processed. This is run in the callback thread of // 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(const AudioInput& input, + void receiveBuffer(const AudioInput& input, const CSAMPLE* pBuffer, - unsigned int iNumSamples); + unsigned int iNumSamples) override; // Called by SoundManager whenever the microphone input is connected to a // soundcard input. - virtual void onInputConfigured(const AudioInput& input); + void onInputConfigured(const AudioInput& input) override; // Called by SoundManager whenever the microphone input is disconnected from // a soundcard input. - virtual void onInputUnconfigured(const AudioInput& input); + void onInputUnconfigured(const AudioInput& input) override; bool isSolo(); double getSoloDamping(); diff --git a/src/engine/engineobject.h b/src/engine/engineobject.h index 88de2c7e492f..3c5c4c443b5c 100644 --- a/src/engine/engineobject.h +++ b/src/engine/engineobject.h @@ -9,7 +9,7 @@ class EngineObject : public QObject { Q_OBJECT public: EngineObject(); - virtual ~EngineObject(); + ~EngineObject() override; virtual void process(CSAMPLE* pInOut, const int iBufferSize) = 0; @@ -24,7 +24,7 @@ class EngineObjectConstIn : public QObject { Q_OBJECT public: EngineObjectConstIn(); - virtual ~EngineObjectConstIn(); + ~EngineObjectConstIn() override; virtual void process(const CSAMPLE* pIn, CSAMPLE* pOut, const int iBufferSize) = 0;