Mercurial > hg > svcore

diff data/fileio/WavFileReader.h @ 1096:4d9816ba0ebe simple-fft-model

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rework audio file reader API to prefer using std containers
author Chris Cannam
date Mon, 15 Jun 2015 12:19:47 +0100
parents 843f67be0ed9
children 54af1e21705c
line wrap: on
line diff
--- a/data/fileio/WavFileReader.h	Sat Jun 13 08:47:05 2015 +0100
+++ b/data/fileio/WavFileReader.h	Mon Jun 15 12:19:47 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;