diff data/fileio/BQAFileReader.h @ 1590:2f8ee436e858 bqaudiostream

Merge

--- a/data/fileio/BQAFileReader.h	Thu Jan 17 17:29:48 2019 +0000
+++ b/data/fileio/BQAFileReader.h	Thu Jan 17 17:30:09 2019 +0000
@@ -41,20 +41,19 @@
                   ProgressReporter *reporter = 0);
     virtual ~BQAFileReader();
 
-    virtual QString getError() const { return m_error; }
-    virtual QString getLocation() const { return m_source.getLocation(); }
-    virtual QString getTitle() const { return m_title; }
-    virtual QString getMaker() const { return m_maker; }
-    virtual TagMap getTags() const { return m_tags; }
+    QString getError() const override { return m_error; }
+    QString getLocation() const override { return m_source.getLocation(); }
+    QString getTitle() const override { return m_title; }
+    QString getMaker() const override { return m_maker; }
     
     static void getSupportedExtensions(std::set<QString> &extensions);
     static bool supportsExtension(QString ext);
     static bool supportsContentType(QString type);
     static bool supports(FileSource &source);
 
-    virtual int getDecodeCompletion() const { return m_completion; }
+    int getDecodeCompletion() const override { return m_completion; }
 
-    virtual bool isUpdating() const {
+    bool isUpdating() const override {
         return m_decodeThread && m_decodeThread->isRunning();
     }
 
@@ -67,7 +66,6 @@
     QString m_error;
     QString m_title;
     QString m_maker;
-    TagMap m_tags;
 
     breakfastquay::AudioReadStream *m_stream;