comparison data/fileio/DecodingWavFileReader.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 cc27f35aa75c
comparison
equal deleted inserted replaced
932:e06f03013f46 933:d03b3d956358
20 #include "base/ProgressReporter.h" 20 #include "base/ProgressReporter.h"
21 21
22 #include <QFileInfo> 22 #include <QFileInfo>
23 23
24 DecodingWavFileReader::DecodingWavFileReader(FileSource source, 24 DecodingWavFileReader::DecodingWavFileReader(FileSource source,
25 ResampleMode resampleMode, 25 ResampleMode resampleMode,
26 CacheMode mode, 26 CacheMode mode,
27 int targetRate, 27 int targetRate,
28 ProgressReporter *reporter) : 28 bool normalised,
29 CodedAudioFileReader(mode, targetRate), 29 ProgressReporter *reporter) :
30 CodedAudioFileReader(mode, targetRate, normalised),
30 m_source(source), 31 m_source(source),
31 m_path(source.getLocalFilename()), 32 m_path(source.getLocalFilename()),
32 m_cancelled(false), 33 m_cancelled(false),
33 m_processed(0), 34 m_processed(0),
34 m_completion(0), 35 m_completion(0),