Mercurial > hg > svcore

diff data/fileio/WavFileReader.h @ 936:0c1d6de8f44b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:51:16 +0100
parents 59e7fe1b1003
children 36f79bc5c3d7
line wrap: on
line diff
--- a/data/fileio/WavFileReader.h	Tue Jun 03 11:05:49 2014 +0100
+++ b/data/fileio/WavFileReader.h	Wed Jun 18 13:51:16 2014 +0100
@@ -48,7 +48,7 @@
      * Must be safe to call from multiple threads with different
      * arguments on the same object at the same time.
      */
-    virtual void getInterleavedFrames(size_t start, size_t count,
+    virtual void getInterleavedFrames(int start, int count,
 				      SampleBlock &frames) const;
     
     static void getSupportedExtensions(std::set<QString> &extensions);
@@ -75,9 +75,9 @@
 
     mutable QMutex m_mutex;
     mutable float *m_buffer;
-    mutable size_t m_bufsiz;
-    mutable size_t m_lastStart;
-    mutable size_t m_lastCount;
+    mutable int m_bufsiz;
+    mutable int m_lastStart;
+    mutable int m_lastCount;
 
     bool m_updating;
 };