Mercurial > hg > svcore

diff data/fileio/DecodingWavFileReader.h @ 935:f960d67ce842 tonioni

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:42:01 +0100
parents d03b3d956358
children cc27f35aa75c
line wrap: on
line diff
--- a/data/fileio/DecodingWavFileReader.h	Mon Jun 16 11:28:45 2014 +0100
+++ b/data/fileio/DecodingWavFileReader.h	Wed Jun 18 13:42:01 2014 +0100
@@ -37,7 +37,7 @@
     DecodingWavFileReader(FileSource source,
                           ResampleMode resampleMode,
                           CacheMode cacheMode,
-                          size_t targetRate = 0,
+                          int targetRate = 0,
                           bool normalised = false,
                           ProgressReporter *reporter = 0);
     virtual ~DecodingWavFileReader();
@@ -63,7 +63,7 @@
     QString m_path;
     QString m_error;
     bool m_cancelled;
-    size_t m_processed;
+    int m_processed;
     int m_completion;
 
     WavFileReader *m_original;