changeset 561:fc70aa31d8c5 3.0-integration

Fix some compiler problems
author Chris Cannam <cannam@all-day-breakfast.com>
date Tue, 13 Dec 2016 16:23:48 +0000
parents e348e0c52115
children 3c846b06c518
files audio/AudioCallbackPlaySource.h
diffstat 1 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/audio/AudioCallbackPlaySource.h	Tue Dec 13 15:46:11 2016 +0000
+++ b/audio/AudioCallbackPlaySource.h	Tue Dec 13 16:23:48 2016 +0000
@@ -141,7 +141,7 @@
      * size; the source should behave itself even if this value turns
      * out to be inaccurate.
      */
-    int getTargetBlockSize() const;
+    virtual int getTargetBlockSize() const override;
 
     /**
      * Set the playback latency of the target audio device, in frames
@@ -170,7 +170,7 @@
      * Return the sample rate set by the target audio device (or the
      * source sample rate if the target hasn't set one).
      */
-    sv_samplerate_t getDeviceSampleRate() const;
+    virtual sv_samplerate_t getDeviceSampleRate() const override;
 
     /**
      * Indicate how many channels the target audio device was opened
@@ -185,13 +185,13 @@
      * Set the current output levels for metering (for call from the
      * target)
      */
-    void setOutputLevels(float left, float right);
+    virtual void setOutputLevels(float left, float right) override;
 
     /**
      * Return the current (or thereabouts) output levels in the range
      * 0.0 -> 1.0, for metering purposes.
      */
-    virtual bool getOutputLevels(float &left, float &right);
+    virtual bool getOutputLevels(float &left, float &right) override;
 
     /**
      * Get the number of channels of audio that in the source models.
@@ -280,7 +280,7 @@
      * Pass a null pointer to remove the current auditioning plugin,
      * if any.
      */
-    void setAuditioningEffect(Auditionable *plugin);
+    virtual void setAuditioningEffect(Auditionable *plugin) override;
 
     /**
      * Specify that only the given set of models should be played.
@@ -293,7 +293,9 @@
      */
     void clearSoloModelSet();
 
-    std::string getClientName() const { return m_clientName; }
+    virtual std::string getClientName() const override {
+        return m_clientName;
+    }
 
 signals:
     void playStatusChanged(bool isPlaying);
@@ -310,7 +312,7 @@
     void activity(QString);
 
 public slots:
-    void audioProcessingOverload();
+    void audioProcessingOverload() override;
 
 protected slots:
     void selectionChanged();