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

Merge from branch tonioni

     };
 
     OggVorbisFileReader(FileSource source,
                         DecodeMode decodeMode,
                         CacheMode cacheMode,
-                        int targetRate = 0,
+                        sv_samplerate_t targetRate = 0,
                         bool normalised = false,
                         ProgressReporter *reporter = 0);
     virtual ~OggVorbisFileReader();
 
     virtual QString getError() const { return m_error; }

     TagMap m_tags;
 
     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;
  
     static int readPacket(OGGZ *, ogg_packet *, long, void *);