Mercurial > hg > svcore
comparison data/fileio/OggVorbisFileReader.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 | a1cd5abcb38b |
comparison
equal
deleted
inserted
replaced
925:3efc20c59a94 | 935:f960d67ce842 |
---|---|
40 }; | 40 }; |
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 int targetRate = 0, |
46 bool normalised = false, | 46 bool normalised = false, |
47 ProgressReporter *reporter = 0); | 47 ProgressReporter *reporter = 0); |
48 virtual ~OggVorbisFileReader(); | 48 virtual ~OggVorbisFileReader(); |
49 | 49 |
50 virtual QString getError() const { return m_error; } | 50 virtual QString getError() const { return m_error; } |
77 TagMap m_tags; | 77 TagMap m_tags; |
78 | 78 |
79 OGGZ *m_oggz; | 79 OGGZ *m_oggz; |
80 FishSound *m_fishSound; | 80 FishSound *m_fishSound; |
81 ProgressReporter *m_reporter; | 81 ProgressReporter *m_reporter; |
82 size_t m_fileSize; | 82 int m_fileSize; |
83 size_t m_bytesRead; | 83 int m_bytesRead; |
84 bool m_commentsRead; | 84 bool m_commentsRead; |
85 bool m_cancelled; | 85 bool m_cancelled; |
86 int m_completion; | 86 int m_completion; |
87 | 87 |
88 static int readPacket(OGGZ *, ogg_packet *, long, void *); | 88 static int readPacket(OGGZ *, ogg_packet *, long, void *); |