comparison data/fileio/DecodingWavFileReader.h @ 935:f960d67ce842 tonioni

Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:42:01 +0100
parents d03b3d956358
children cc27f35aa75c
comparison
equal deleted inserted replaced
925:3efc20c59a94 935:f960d67ce842
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 size_t targetRate = 0, 40 int targetRate = 0,
41 bool normalised = false, 41 bool normalised = false,
42 ProgressReporter *reporter = 0); 42 ProgressReporter *reporter = 0);
43 virtual ~DecodingWavFileReader(); 43 virtual ~DecodingWavFileReader();
44 44
45 virtual QString getError() const { return m_error; } 45 virtual QString getError() const { return m_error; }
61 protected: 61 protected:
62 FileSource m_source; 62 FileSource m_source;
63 QString m_path; 63 QString m_path;
64 QString m_error; 64 QString m_error;
65 bool m_cancelled; 65 bool m_cancelled;
66 size_t m_processed; 66 int m_processed;
67 int m_completion; 67 int m_completion;
68 68
69 WavFileReader *m_original; 69 WavFileReader *m_original;
70 ProgressReporter *m_reporter; 70 ProgressReporter *m_reporter;
71 71