comparison data/fileio/MP3FileReader.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 048173126e71
comparison
equal deleted inserted replaced
932:e06f03013f46 933:d03b3d956358
36 36
37 #include <QFileInfo> 37 #include <QFileInfo>
38 38
39 MP3FileReader::MP3FileReader(FileSource source, DecodeMode decodeMode, 39 MP3FileReader::MP3FileReader(FileSource source, DecodeMode decodeMode,
40 CacheMode mode, int targetRate, 40 CacheMode mode, int targetRate,
41 bool normalised,
41 ProgressReporter *reporter) : 42 ProgressReporter *reporter) :
42 CodedAudioFileReader(mode, targetRate), 43 CodedAudioFileReader(mode, targetRate, normalised),
43 m_source(source), 44 m_source(source),
44 m_path(source.getLocalFilename()), 45 m_path(source.getLocalFilename()),
45 m_decodeThread(0) 46 m_decodeThread(0)
46 { 47 {
47 m_channelCount = 0; 48 m_channelCount = 0;