comparison data/fileio/CoreAudioFileReader.cpp @ 936:0c1d6de8f44b

Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:51:16 +0100
parents d03b3d956358
children 01a90c025eaa a1cd5abcb38b
comparison
equal deleted inserted replaced
917:49618f39ff09 936:0c1d6de8f44b
57 } 57 }
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 int 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),