Mercurial > hg > sonic-annotator

diff runner/MultiplexedReader.h @ 288:fd4a6183482f kapoor_1202

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch piper-nopiper. The next release will be based on this.
author Chris Cannam
date Fri, 02 Dec 2016 10:04:44 +0000
parents 857ce6ecb163
children 6122159556bd
line wrap: on
line diff
--- a/runner/MultiplexedReader.h	Mon Nov 21 16:32:58 2016 +0000
+++ b/runner/MultiplexedReader.h	Fri Dec 02 10:04:44 2016 +0000
@@ -30,14 +30,15 @@
     MultiplexedReader(QList<AudioFileReader *> readers);
     virtual ~MultiplexedReader();
 
-    virtual QString getError() const { return m_error; }
-    virtual bool isQuicklySeekable() const { return m_quicklySeekable; }
+    virtual QString getError() const override { return m_error; }
+    virtual bool isQuicklySeekable() const override { return m_quicklySeekable; }
 
-    virtual SampleBlock getInterleavedFrames(sv_frame_t start, sv_frame_t count) const;
+    virtual std::vector<float> getInterleavedFrames
+    (sv_frame_t start, sv_frame_t count) const override;
 
-    virtual int getDecodeCompletion() const;
+    virtual int getDecodeCompletion() const override;
 
-    virtual bool isUpdating() const;
+    virtual bool isUpdating() const override;
 
 protected:
     QString m_error;