comparison data/fileio/DecodingWavFileReader.h @ 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
33 ResampleAtOnce, // resample the file on construction, with progress dialog 33 ResampleAtOnce, // resample the file on construction, with progress dialog
34 ResampleThreaded // resample in a background thread after construction 34 ResampleThreaded // resample in a background thread after construction
35 }; 35 };
36 36
37 DecodingWavFileReader(FileSource source, 37 DecodingWavFileReader(FileSource source,
38 ResampleMode resampleMode, 38 ResampleMode resampleMode,
39 CacheMode cacheMode, 39 CacheMode cacheMode,
40 int targetRate = 0, 40 int targetRate = 0,
41 ProgressReporter *reporter = 0); 41 bool normalised = false,
42 ProgressReporter *reporter = 0);
42 virtual ~DecodingWavFileReader(); 43 virtual ~DecodingWavFileReader();
43 44
44 virtual QString getError() const { return m_error; } 45 virtual QString getError() const { return m_error; }
45 virtual QString getLocation() const { return m_source.getLocation(); } 46 virtual QString getLocation() const { return m_source.getLocation(); }
46 static void getSupportedExtensions(std::set<QString> &extensions); 47 static void getSupportedExtensions(std::set<QString> &extensions);