comparison data/fileio/QuickTimeFileReader.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
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 size_t targetRate, 53 size_t 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),