Merge from 1.1.

--HG--
rename : src/libdts/xine_dts_decoder.c => src/audio_dec/xine_dts_decoder.c
rename : src/libxineadec/xine_lpcm_decoder.c => src/audio_dec/xine_lpcm_decoder.c
rename : src/combined/decoder_flac.c => src/combined/flac_decoder.c
rename : src/combined/demux_flac.c => src/combined/flac_demuxer.c
rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c

2 files changed, 20 insertions, 8 deletions

diff --git a/src/combined/flac_decoder.c b/src/combined/flac_decoder.c
index 1572fd2be..2d4176f9a 100644
--- a/src/combined/flac_decoder.c
+++ b/src/combined/flac_decoder.c
@@ -62,9 +62,9 @@ typedef struct flac_decoder_s {
   FLAC__StreamDecoder *flac_decoder;
 
   unsigned char *buf;
-  int            buf_size;
-  int            buf_pos;
-  int            min_size;
+  size_t         buf_size;
+  size_t         buf_pos;
+  size_t         min_size;
 
   int            output_open;
 
@@ -74,23 +74,31 @@ 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;
+    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;
 
diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c
index 0685631c7..7b4ed3c95 100644
--- a/src/combined/flac_demuxer.c
+++ b/src/combined/flac_demuxer.c
@@ -101,13 +101,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;