Mercurial > hg > svcore
comparison data/fileio/OggVorbisFileReader.cpp @ 927:5f021c13a4cc tony_integration
Merge from branch "tonioni"
author | Chris Cannam |
---|---|
date | Tue, 17 Jun 2014 12:54:51 +0100 |
parents | f3cda3280398 |
children | d03b3d956358 |
comparison
equal
deleted
inserted
replaced
926:926f33d3a8b7 | 927:5f021c13a4cc |
---|---|
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 size_t targetRate, | 37 size_t 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), |