comparison data/fileio/MP3FileReader.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
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, size_t targetRate, 40 CacheMode mode, size_t 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;