Mercurial > hg > svcore

diff data/fileio/QuickTimeFileReader.cpp @ 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 a1cd5abcb38b
line wrap: on
line diff
--- a/data/fileio/QuickTimeFileReader.cpp	Tue Jun 03 11:05:49 2014 +0100
+++ b/data/fileio/QuickTimeFileReader.cpp	Wed Jun 18 13:51:16 2014 +0100
@@ -43,16 +43,17 @@
     OSErr                        err; 
     AudioStreamBasicDescription  asbd;
     Movie                        movie;
-    size_t                       blockSize;
+    int                          blockSize;
 };
 
 
 QuickTimeFileReader::QuickTimeFileReader(FileSource source,
                                          DecodeMode decodeMode,
                                          CacheMode mode,
-                                         size_t targetRate,
+                                         int targetRate,
+                                         bool normalised,
                                          ProgressReporter *reporter) :
-    CodedAudioFileReader(mode, targetRate),
+    CodedAudioFileReader(mode, targetRate, normalised),
     m_source(source),
     m_path(source.getLocalFilename()),
     m_d(new D),