Mercurial > hg > svcore

diff data/fileio/OggVorbisFileReader.h @ 1069:32ab6c48efaa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch tonioni
author Chris Cannam
date Mon, 20 Apr 2015 09:11:34 +0100
parents fe39581d249b
children abc309f507ae
line wrap: on
line diff
--- a/data/fileio/OggVorbisFileReader.h	Mon Mar 02 17:21:34 2015 +0000
+++ b/data/fileio/OggVorbisFileReader.h	Mon Apr 20 09:11:34 2015 +0100
@@ -42,7 +42,7 @@
     OggVorbisFileReader(FileSource source,
                         DecodeMode decodeMode,
                         CacheMode cacheMode,
-                        int targetRate = 0,
+                        sv_samplerate_t targetRate = 0,
                         bool normalised = false,
                         ProgressReporter *reporter = 0);
     virtual ~OggVorbisFileReader();
@@ -79,8 +79,8 @@
     OGGZ *m_oggz;
     FishSound *m_fishSound;
     ProgressReporter *m_reporter;
-    int m_fileSize;
-    int m_bytesRead;
+    sv_frame_t m_fileSize;
+    sv_frame_t m_bytesRead;
     bool m_commentsRead;
     bool m_cancelled;
     int m_completion;