Mercurial > hg > svcore

diff data/fileio/WavFileReader.h @ 1126:39019ce29178 tony-2.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge through to branch for Tony 2.0
author Chris Cannam
date Thu, 20 Aug 2015 14:54:21 +0100
parents 4d9816ba0ebe
children 54af1e21705c
line wrap: on
line diff
--- a/data/fileio/WavFileReader.h	Fri Aug 14 18:16:14 2015 +0100
+++ b/data/fileio/WavFileReader.h	Thu Aug 20 14:54:21 2015 +0100
@@ -50,7 +50,7 @@
      * Must be safe to call from multiple threads with different
      * arguments on the same object at the same time.
      */
-    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;
     
     static void getSupportedExtensions(std::set<QString> &extensions);
     static bool supportsExtension(QString ext);
@@ -75,8 +75,7 @@
     bool m_seekable;
 
     mutable QMutex m_mutex;
-    mutable SampleBlock m_buffer;
-    mutable sv_frame_t m_bufsiz;
+    mutable std::vector<float> m_buffer;
     mutable sv_frame_t m_lastStart;
     mutable sv_frame_t m_lastCount;