Mercurial > hg > svcore

diff data/fileio/OggVorbisFileReader.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 a1cd5abcb38b
line wrap: on
line diff
--- a/data/fileio/OggVorbisFileReader.h	Tue Jun 03 11:05:49 2014 +0100
+++ b/data/fileio/OggVorbisFileReader.h	Wed Jun 18 13:51:16 2014 +0100
@@ -42,7 +42,8 @@
     OggVorbisFileReader(FileSource source,
                         DecodeMode decodeMode,
                         CacheMode cacheMode,
-                        size_t targetRate = 0,
+                        int targetRate = 0,
+                        bool normalised = false,
                         ProgressReporter *reporter = 0);
     virtual ~OggVorbisFileReader();
 
@@ -78,8 +79,8 @@
     OGGZ *m_oggz;
     FishSound *m_fishSound;
     ProgressReporter *m_reporter;
-    size_t m_fileSize;
-    size_t m_bytesRead;
+    int m_fileSize;
+    int m_bytesRead;
     bool m_commentsRead;
     bool m_cancelled;
     int m_completion;