Attachment #122212 for bug #181822

View | Details | Raw Unified | Return to bug 181822
Collapse All | Expand All

Lines 191-197 class FlacStream Link Here

(-)input/flac/FlacStream.h-dist (-2 / +2 lines)
191		191
192	FLAC__StreamDecoderReadStatus	192	FLAC__StreamDecoderReadStatus
193	realReadCallBack (FLAC__byte buffer[],	193	realReadCallBack (FLAC__byte buffer[],
194	unsigned * bytes);	194	size_t * bytes);
195		195
196		196
197	protected:	197	protected:
Lines 233-239 class FlacStream Link Here
233	static FLAC__StreamDecoderReadStatus	233	static FLAC__StreamDecoderReadStatus
234	readCallBack (const FLAC__StreamDecoder * decoder,	234	readCallBack (const FLAC__StreamDecoder * decoder,
235	FLAC__byte buffer[],	235	FLAC__byte buffer[],
236	unsigned * bytes,	236	size_t * bytes,
237	void * client_data);	237	void * client_data);
238		238
239	static void errCallBack (const FLAC__StreamDecoder * decoder,	239	static void errCallBack (const FLAC__StreamDecoder * decoder,

Lines 321-327 Link Here

(-)input/flac/FlacStream.cpp-dist (-2 / +2 lines)
321		321
322		322
323	FLAC__StreamDecoderReadStatus	323	FLAC__StreamDecoderReadStatus
324	FlacStream::realReadCallBack (FLAC__byte buffer[], unsigned * bytes)	324	FlacStream::realReadCallBack (FLAC__byte buffer[], size_t * bytes)
325	{	325	{
326	bytes = reader_read (buffer, bytes, _datasource);	326	bytes = reader_read (buffer, bytes, _datasource);
327	return *bytes > 0 ? FLAC__STREAM_DECODER_READ_STATUS_CONTINUE :	327	return *bytes > 0 ? FLAC__STREAM_DECODER_READ_STATUS_CONTINUE :
Lines 336-342 Link Here
336	FLAC__StreamDecoderReadStatus	336	FLAC__StreamDecoderReadStatus
337	FlacStream::readCallBack (const FLAC__StreamDecoder *,	337	FlacStream::readCallBack (const FLAC__StreamDecoder *,
338	FLAC__byte buffer[],	338	FLAC__byte buffer[],
339	unsigned * bytes,	339	size_t * bytes,
340	void * client_data)	340	void * client_data)
341	{	341	{
342	if (!client_data)	342	if (!client_data)

Lines 255-261 Link Here

(-)input/flac/FlacSeekableStream.cpp-dist (-1 / +1 lines)
255	FlacSeekableStream::readCallBack (const FLAC__StreamDecoder * /decoder/,	255	FlacSeekableStream::readCallBack (const FLAC__StreamDecoder * /decoder/,
256	#endif	256	#endif
257	FLAC__byte buffer[],	257	FLAC__byte buffer[],
258	unsigned * bytes,	258	size_t * bytes,
259	void * client_data)	259	void * client_data)
260	{	260	{
261	if (!client_data)	261	if (!client_data)

Lines 114-120 class FlacSeekableStream : public FlacSt Link Here

(-)input/flac/FlacSeekableStream.h-dist (-1 / +1 lines)
114	readCallBack (const FLAC__StreamDecoder * decoder,	114	readCallBack (const FLAC__StreamDecoder * decoder,
115	#endif	115	#endif
116	FLAC__byte buffer[],	116	FLAC__byte buffer[],
117	unsigned * bytes,	117	size_t * bytes,
118	void * client_data);	118	void * client_data);
119		119
120	#ifdef LEGACY_FLAC	120	#ifdef LEGACY_FLAC

Return to bug 181822