diff data/fileio/CodedAudioFileReader.h @ 1599:ce185d4dd408 bqaudiostream

Merge from default branch

--- a/data/fileio/CodedAudioFileReader.h	Wed Jan 23 10:31:40 2019 +0000
+++ b/data/fileio/CodedAudioFileReader.h	Wed Jan 23 14:43:43 2019 +0000
@@ -52,14 +52,14 @@
         DecodeThreaded // decode in a background thread after construction
     };
 
-    virtual floatvec_t getInterleavedFrames(sv_frame_t start, sv_frame_t count) const;
+    floatvec_t getInterleavedFrames(sv_frame_t start, sv_frame_t count) const override;
 
-    virtual sv_samplerate_t getNativeRate() const { return m_fileRate; }
+    sv_samplerate_t getNativeRate() const override { return m_fileRate; }
 
-    virtual QString getLocalFilename() const { return m_cacheFileName; }
+    QString getLocalFilename() const override { return m_cacheFileName; }
     
     /// Intermediate cache means all CodedAudioFileReaders are quickly seekable
-    virtual bool isQuicklySeekable() const { return true; }
+    bool isQuicklySeekable() const override { return true; }
 
 signals:
     void progress(int);