Mercurial > hg > svcore

comparison data/fileio/MP3FileReader.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 cc27f35aa75c
comparison
equal deleted inserted replaced
917:49618f39ff09 936:0c1d6de8f44b
38 }; 38 };
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 int 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
70 QString m_path; 71 QString m_path;
71 QString m_error; 72 QString m_error;
72 QString m_title; 73 QString m_title;
73 QString m_maker; 74 QString m_maker;
74 TagMap m_tags; 75 TagMap m_tags;
75 size_t m_fileSize; 76 int m_fileSize;
76 double m_bitrateNum; 77 double m_bitrateNum;
77 size_t m_bitrateDenom; 78 int m_bitrateDenom;
78 int m_completion; 79 int m_completion;
79 bool m_done; 80 bool m_done;
80 81
81 unsigned char *m_filebuffer; 82 unsigned char *m_filebuffer;
82 float **m_samplebuffer; 83 float **m_samplebuffer;
83 size_t m_samplebuffersize; 84 int m_samplebuffersize;
84 85
85 ProgressReporter *m_reporter; 86 ProgressReporter *m_reporter;
86 bool m_cancelled; 87 bool m_cancelled;
87 88
88 struct DecoderData 89 struct DecoderData
90 unsigned char const *start; 91 unsigned char const *start;
91 unsigned long length; 92 unsigned long length;
92 MP3FileReader *reader; 93 MP3FileReader *reader;
93 }; 94 };
94 95
95 bool decode(void *mm, size_t sz); 96 bool decode(void *mm, int sz);
96 enum mad_flow accept(struct mad_header const *, struct mad_pcm *); 97 enum mad_flow accept(struct mad_header const *, struct mad_pcm *);
97 98
98 static enum mad_flow input(void *, struct mad_stream *); 99 static enum mad_flow input(void *, struct mad_stream *);
99 static enum mad_flow output(void *, struct mad_header const *, struct mad_pcm *); 100 static enum mad_flow output(void *, struct mad_header const *, struct mad_pcm *);
100 static enum mad_flow error(void *, struct mad_stream *, struct mad_frame *); 101 static enum mad_flow error(void *, struct mad_stream *, struct mad_frame *);