SDL_sound-flac.patch

   1 --- SDL_sound-1.0.1/configure.in.orig   2003-10-12 20:49:54.000000000 +0200
   2 +++ SDL_sound-1.0.1/configure.in        2006-12-28 01:32:57.687466105 +0100
   3 @@ -157,7 +157,7 @@
   4  dnl  obsolete versions.
   5
   6  dnl Hooray for shitty autoconf bugs!
   7 -x="C__seekable_stream_decoder_process_single"
   8 +x="C__stream_decoder_process_single"
   9  flcsym="FLA$x"
  10  dnl Check for libFLAC
  11  AC_ARG_ENABLE(flac,
  12 --- SDL_sound-1.0.1/decoders/flac.c.orig        2003-03-10 23:44:14.000000000 +0100
  13 +++ SDL_sound-1.0.1/decoders/flac.c     2006-12-28 01:43:13.870580380 +0100
  14 @@ -44,42 +44,33 @@
  15  #define __SDL_SOUND_INTERNAL__
  16  #include "SDL_sound_internal.h"
  17
  18 -#include <FLAC/seekable_stream_decoder.h>
  19 +#include <FLAC/stream_decoder.h>
  20
  21 -#define D_END_OF_STREAM               FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM
  22 +#define D_END_OF_STREAM               FLAC__STREAM_DECODER_END_OF_STREAM
  23
  24 -#define d_new()                       FLAC__seekable_stream_decoder_new()
  25 -#define d_init(x)                     FLAC__seekable_stream_decoder_init(x)
  26 -#define d_process_metadata(x)         FLAC__seekable_stream_decoder_process_until_end_of_metadata(x)
  27 -#define d_process_one_frame(x)        FLAC__seekable_stream_decoder_process_single(x)
  28 -#define d_get_state(x)                FLAC__seekable_stream_decoder_get_state(x)
  29 -#define d_finish(x)                   FLAC__seekable_stream_decoder_finish(x)
  30 -#define d_delete(x)                   FLAC__seekable_stream_decoder_delete(x)
  31 -#define d_set_read_callback(x, y)     FLAC__seekable_stream_decoder_set_read_callback(x, y)
  32 -#define d_set_write_callback(x, y)    FLAC__seekable_stream_decoder_set_write_callback(x, y)
  33 -#define d_set_metadata_callback(x, y) FLAC__seekable_stream_decoder_set_metadata_callback(x, y)
  34 -#define d_set_error_callback(x, y)    FLAC__seekable_stream_decoder_set_error_callback(x, y)
  35 -#define d_set_client_data(x, y)       FLAC__seekable_stream_decoder_set_client_data(x, y)
  36 -
  37 -typedef FLAC__SeekableStreamDecoder           decoder_t;
  38 -typedef FLAC__SeekableStreamDecoderReadStatus d_read_status_t;
  39 -
  40 -#define D_SEEK_STATUS_OK              FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK
  41 -#define D_SEEK_STATUS_ERROR           FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR
  42 -#define D_TELL_STATUS_OK              FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK
  43 -#define D_TELL_STATUS_ERROR           FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR
  44 -#define D_LENGTH_STATUS_OK            FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK
  45 -#define D_LENGTH_STATUS_ERROR         FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR
  46 -
  47 -#define d_set_seek_callback(x, y)     FLAC__seekable_stream_decoder_set_seek_callback(x, y)
  48 -#define d_set_tell_callback(x, y)     FLAC__seekable_stream_decoder_set_tell_callback(x, y)
  49 -#define d_set_length_callback(x, y)   FLAC__seekable_stream_decoder_set_length_callback(x, y)
  50 -#define d_set_eof_callback(x, y)      FLAC__seekable_stream_decoder_set_eof_callback(x, y)
  51 -#define d_seek_absolute(x, y)         FLAC__seekable_stream_decoder_seek_absolute(x, y)
  52 -
  53 -typedef FLAC__SeekableStreamDecoderSeekStatus   d_seek_status_t;
  54 -typedef FLAC__SeekableStreamDecoderTellStatus   d_tell_status_t;
  55 -typedef FLAC__SeekableStreamDecoderLengthStatus d_length_status_t;
  56 +#define d_new()                       FLAC__stream_decoder_new()
  57 +#define d_init                        FLAC__stream_decoder_init_stream
  58 +#define d_process_metadata(x)         FLAC__stream_decoder_process_until_end_of_metadata(x)
  59 +#define d_process_one_frame(x)        FLAC__stream_decoder_process_single(x)
  60 +#define d_get_state(x)                FLAC__stream_decoder_get_state(x)
  61 +#define d_finish(x)                   FLAC__stream_decoder_finish(x)
  62 +#define d_delete(x)                   FLAC__stream_decoder_delete(x)
  63 +
  64 +typedef FLAC__StreamDecoder           decoder_t;
  65 +typedef FLAC__StreamDecoderReadStatus d_read_status_t;
  66 +
  67 +#define D_SEEK_STATUS_OK              FLAC__STREAM_DECODER_SEEK_STATUS_OK
  68 +#define D_SEEK_STATUS_ERROR           FLAC__STREAM_DECODER_SEEK_STATUS_ERROR
  69 +#define D_TELL_STATUS_OK              FLAC__STREAM_DECODER_TELL_STATUS_OK
  70 +#define D_TELL_STATUS_ERROR           FLAC__STREAM_DECODER_TELL_STATUS_ERROR
  71 +#define D_LENGTH_STATUS_OK            FLAC__STREAM_DECODER_LENGTH_STATUS_OK
  72 +#define D_LENGTH_STATUS_ERROR         FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR
  73 +
  74 +#define d_seek_absolute(x, y)         FLAC__stream_decoder_seek_absolute(x, y)
  75 +
  76 +typedef FLAC__StreamDecoderSeekStatus   d_seek_status_t;
  77 +typedef FLAC__StreamDecoderTellStatus   d_tell_status_t;
  78 +typedef FLAC__StreamDecoderLengthStatus d_length_status_t;
  79
  80  #define D_WRITE_CONTINUE     FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE
  81  #define D_READ_END_OF_STREAM FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM
  82 @@ -400,17 +391,6 @@
  83          BAIL_MACRO(ERR_OUT_OF_MEMORY, 0);
  84      } /* if */
  85
  86 -    d_set_read_callback(decoder, read_callback);
  87 -    d_set_write_callback(decoder, write_callback);
  88 -    d_set_metadata_callback(decoder, metadata_callback);
  89 -    d_set_error_callback(decoder, error_callback);
  90 -    d_set_seek_callback(decoder, seek_callback);
  91 -    d_set_tell_callback(decoder, tell_callback);
  92 -    d_set_length_callback(decoder, length_callback);
  93 -    d_set_eof_callback(decoder, eof_callback);
  94 -
  95 -    d_set_client_data(decoder, f);
  96 -
  97      f->rw = internal->rw;
  98      f->sample = sample;
  99      f->decoder = decoder;
 100 @@ -418,7 +398,9 @@
 101      f->is_flac = 0 /* !!! FIXME: should be "has_extension", not "0". */;
 102
 103      internal->decoder_private = f;
 104 -    d_init(decoder);
 105 +    d_init(decoder, read_callback, seek_callback, tell_callback,
 106 +       length_callback, eof_callback, write_callback, metadata_callback,
 107 +       error_callback, f);
 108
 109      sample->flags = SOUND_SAMPLEFLAG_NONE;
 110