Mercurial > hg > svcore

comparison data/fileio/OggVorbisFileReader.h @ 936:0c1d6de8f44b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:51:16 +0100
parents d03b3d956358
children a1cd5abcb38b
comparison
equal deleted inserted replaced
917:49618f39ff09 936:0c1d6de8f44b
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 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
76 TagMap m_tags; 77 TagMap m_tags;
77 78
78 OGGZ *m_oggz; 79 OGGZ *m_oggz;
79 FishSound *m_fishSound; 80 FishSound *m_fishSound;
80 ProgressReporter *m_reporter; 81 ProgressReporter *m_reporter;
81 size_t m_fileSize; 82 int m_fileSize;
82 size_t m_bytesRead; 83 int m_bytesRead;
83 bool m_commentsRead; 84 bool m_commentsRead;
84 bool m_cancelled; 85 bool m_cancelled;
85 int m_completion; 86 int m_completion;
86 87
87 static int readPacket(OGGZ *, ogg_packet *, long, void *); 88 static int readPacket(OGGZ *, ogg_packet *, long, void *);