Mercurial > hg > svcore
comparison data/fileio/MP3FileReader.h @ 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 |
|---|---|
| 39 | 39 |
| 40 MP3FileReader(FileSource source, | 40 MP3FileReader(FileSource source, |
| 41 DecodeMode decodeMode, | 41 DecodeMode decodeMode, |
| 42 CacheMode cacheMode, | 42 CacheMode cacheMode, |
| 43 size_t targetRate = 0, | 43 size_t targetRate = 0, |
| 44 bool normalised = false, | |
| 44 ProgressReporter *reporter = 0); | 45 ProgressReporter *reporter = 0); |
| 45 virtual ~MP3FileReader(); | 46 virtual ~MP3FileReader(); |
| 46 | 47 |
| 47 virtual QString getError() const { return m_error; } | 48 virtual QString getError() const { return m_error; } |
| 48 | 49 |