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