From ebdd937405e27e2fa5e7eff39654b30bab57e070 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Fri, 16 Dec 2011 12:21:59 +0200 Subject: Fixed flac_read_callback() signature for flac 1.1.3+ (when sizeof(size_t) != sizeof(unsigned)) --HG-- branch : point-release --- src/combined/decoder_flac.c | 8 ++++++++ src/combined/demux_flac.c | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'src/combined') diff --git a/src/combined/decoder_flac.c b/src/combined/decoder_flac.c index fe1822797..079c01008 100644 --- a/src/combined/decoder_flac.c +++ b/src/combined/decoder_flac.c @@ -82,11 +82,19 @@ typedef struct flac_decoder_s { * FLAC callback functions */ +#ifdef LEGACY_FLAC static FLAC__StreamDecoderReadStatus flac_read_callback (const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data) +#else +static FLAC__StreamDecoderReadStatus +flac_read_callback (const FLAC__StreamDecoder *decoder, + FLAC__byte buffer[], + size_t *bytes, + void *client_data) +#endif { flac_decoder_t *this = (flac_decoder_t *)client_data; int number_of_bytes_to_copy; diff --git a/src/combined/demux_flac.c b/src/combined/demux_flac.c index 9c5f7de32..494bb5050 100644 --- a/src/combined/demux_flac.c +++ b/src/combined/demux_flac.c @@ -103,13 +103,17 @@ typedef struct demux_flac_class_s { static #ifdef LEGACY_FLAC FLAC__SeekableStreamDecoderReadStatus +flac_read_callback (const FLAC__SeekableStreamDecoder *decoder, + FLAC__byte buffer[], + unsigned *bytes, + void *client_data) #else FLAC__StreamDecoderReadStatus -#endif flac_read_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer[], - unsigned *bytes, + size_t *bytes, void *client_data) +#endif { demux_flac_t *this = (demux_flac_t *)client_data; input_plugin_t *input = this->input; -- cgit v1.2.3 From 8304f7562d4023c2a5c8d7ca767c5676273dcbec Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Fri, 16 Dec 2011 12:25:20 +0200 Subject: flac decoder: int -> size_t --HG-- branch : point-release --- src/combined/decoder_flac.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/combined') diff --git a/src/combined/decoder_flac.c b/src/combined/decoder_flac.c index 079c01008..b8650810b 100644 --- a/src/combined/decoder_flac.c +++ b/src/combined/decoder_flac.c @@ -72,9 +72,9 @@ typedef struct flac_decoder_s { int channels; unsigned char *buf; - int buf_size; - int buf_pos; - int min_size; + size_t buf_size; + size_t buf_pos; + size_t min_size; } flac_decoder_t; @@ -97,16 +97,16 @@ flac_read_callback (const FLAC__StreamDecoder *decoder, #endif { flac_decoder_t *this = (flac_decoder_t *)client_data; - int number_of_bytes_to_copy; + size_t number_of_bytes_to_copy; - lprintf("flac_read_callback: %d\n", *bytes); + lprintf("flac_read_callback: %zd\n", (size_t)*bytes); if (this->buf_pos > *bytes) number_of_bytes_to_copy = *bytes; else number_of_bytes_to_copy = this->buf_pos; - lprintf("number_of_bytes_to_copy: %d\n", number_of_bytes_to_copy); + lprintf("number_of_bytes_to_copy: %zd\n", number_of_bytes_to_copy); *bytes = number_of_bytes_to_copy; -- cgit v1.2.3