Mercurial > hg > svcore
comparison data/fileio/CoreAudioFileReader.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 |
---|---|
58 | 58 |
59 CoreAudioFileReader::CoreAudioFileReader(FileSource source, | 59 CoreAudioFileReader::CoreAudioFileReader(FileSource source, |
60 DecodeMode decodeMode, | 60 DecodeMode decodeMode, |
61 CacheMode mode, | 61 CacheMode mode, |
62 size_t targetRate, | 62 size_t targetRate, |
63 bool normalised, | |
63 ProgressReporter *reporter) : | 64 ProgressReporter *reporter) : |
64 CodedAudioFileReader(mode, targetRate), | 65 CodedAudioFileReader(mode, targetRate, normalised), |
65 m_source(source), | 66 m_source(source), |
66 m_path(source.getLocalFilename()), | 67 m_path(source.getLocalFilename()), |
67 m_d(new D), | 68 m_d(new D), |
68 m_reporter(reporter), | 69 m_reporter(reporter), |
69 m_cancelled(false), | 70 m_cancelled(false), |