diff data/fileio/WavFileReader.h @ 1069:32ab6c48efaa

Merge from branch tonioni

--- a/data/fileio/WavFileReader.h	Mon Mar 02 17:21:34 2015 +0000
+++ b/data/fileio/WavFileReader.h	Mon Apr 20 09:11:34 2015 +0100
@@ -50,8 +50,7 @@
      * Must be safe to call from multiple threads with different
      * arguments on the same object at the same time.
      */
-    virtual void getInterleavedFrames(int start, int count,
-				      SampleBlock &frames) const;
+    virtual SampleBlock getInterleavedFrames(sv_frame_t start, sv_frame_t count) const;
     
     static void getSupportedExtensions(std::set<QString> &extensions);
     static bool supportsExtension(QString ext);
@@ -76,10 +75,10 @@
     bool m_seekable;
 
     mutable QMutex m_mutex;
-    mutable float *m_buffer;
-    mutable int m_bufsiz;
-    mutable int m_lastStart;
-    mutable int m_lastCount;
+    mutable SampleBlock m_buffer;
+    mutable sv_frame_t m_bufsiz;
+    mutable sv_frame_t m_lastStart;
+    mutable sv_frame_t m_lastCount;
 
     bool m_updating;
 };