Mercurial > hg > svcore

diff data/fileio/DecodingWavFileReader.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 d03b3d956358
children cc27f35aa75c
line wrap: on
line diff
--- a/data/fileio/DecodingWavFileReader.h	Tue Jun 03 11:05:49 2014 +0100
+++ b/data/fileio/DecodingWavFileReader.h	Wed Jun 18 13:51:16 2014 +0100
@@ -35,10 +35,11 @@
     };
 
     DecodingWavFileReader(FileSource source,
-                            ResampleMode resampleMode,
-                            CacheMode cacheMode,
-                            size_t targetRate = 0,
-                            ProgressReporter *reporter = 0);
+                          ResampleMode resampleMode,
+                          CacheMode cacheMode,
+                          int targetRate = 0,
+                          bool normalised = false,
+                          ProgressReporter *reporter = 0);
     virtual ~DecodingWavFileReader();
 
     virtual QString getError() const { return m_error; }
@@ -62,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;