Mercurial > hg > svcore
comparison data/fileio/QuickTimeFileReader.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 | a1cd5abcb38b |
comparison
equal
deleted
inserted
replaced
932:e06f03013f46 | 933:d03b3d956358 |
---|---|
49 | 49 |
50 QuickTimeFileReader::QuickTimeFileReader(FileSource source, | 50 QuickTimeFileReader::QuickTimeFileReader(FileSource source, |
51 DecodeMode decodeMode, | 51 DecodeMode decodeMode, |
52 CacheMode mode, | 52 CacheMode mode, |
53 int targetRate, | 53 int targetRate, |
54 bool normalised, | |
54 ProgressReporter *reporter) : | 55 ProgressReporter *reporter) : |
55 CodedAudioFileReader(mode, targetRate), | 56 CodedAudioFileReader(mode, targetRate, normalised), |
56 m_source(source), | 57 m_source(source), |
57 m_path(source.getLocalFilename()), | 58 m_path(source.getLocalFilename()), |
58 m_d(new D), | 59 m_d(new D), |
59 m_reporter(reporter), | 60 m_reporter(reporter), |
60 m_cancelled(false), | 61 m_cancelled(false), |