comparison data/fileio/OggVorbisFileReader.cpp @ 933:d03b3d956358 warnfix_no_size_t

Merge from branch tony_integration
author Chris Cannam
date Wed, 18 Jun 2014 08:34:46 +0100
parents 59e7fe1b1003 f3cda3280398
children 1ecd533a9977
comparison
equal deleted inserted replaced
932:e06f03013f46 933:d03b3d956358
33 33
34 OggVorbisFileReader::OggVorbisFileReader(FileSource source, 34 OggVorbisFileReader::OggVorbisFileReader(FileSource source,
35 DecodeMode decodeMode, 35 DecodeMode decodeMode,
36 CacheMode mode, 36 CacheMode mode,
37 int targetRate, 37 int targetRate,
38 bool normalised,
38 ProgressReporter *reporter) : 39 ProgressReporter *reporter) :
39 CodedAudioFileReader(mode, targetRate), 40 CodedAudioFileReader(mode, targetRate, normalised),
40 m_source(source), 41 m_source(source),
41 m_path(source.getLocalFilename()), 42 m_path(source.getLocalFilename()),
42 m_reporter(reporter), 43 m_reporter(reporter),
43 m_fileSize(0), 44 m_fileSize(0),
44 m_bytesRead(0), 45 m_bytesRead(0),