Mercurial > hg > svcore
comparison data/fileio/OggVorbisFileReader.cpp @ 935:f960d67ce842 tonioni
Merge from branch warnfix_no_size_t
author | Chris Cannam |
---|---|
date | Wed, 18 Jun 2014 13:42:01 +0100 |
parents | d03b3d956358 |
children | 1ecd533a9977 |
comparison
equal
deleted
inserted
replaced
925:3efc20c59a94 | 935:f960d67ce842 |
---|---|
32 //static int instances = 0; | 32 //static int instances = 0; |
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 int targetRate, |
38 bool normalised, | 38 bool normalised, |
39 ProgressReporter *reporter) : | 39 ProgressReporter *reporter) : |
40 CodedAudioFileReader(mode, targetRate, normalised), | 40 CodedAudioFileReader(mode, targetRate, normalised), |
41 m_source(source), | 41 m_source(source), |
42 m_path(source.getLocalFilename()), | 42 m_path(source.getLocalFilename()), |