Ticket #13960: patch-decoders-flac.c

File patch-decoders-flac.c, 4.9 KB (added by tow@…, 16 years ago)
Line 
1--- decoders/flac.c.orig        2008-01-16 22:11:00.000000000 +0000
2+++ decoders/flac.c     2008-01-16 21:40:32.000000000 +0000
3@@ -44,42 +44,42 @@
4 #define __SDL_SOUND_INTERNAL__
5 #include "SDL_sound_internal.h"
6 
7-#include <FLAC/seekable_stream_decoder.h>
8+#include <FLAC/stream_decoder.h>
9 
10-#define D_END_OF_STREAM               FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM
11+#define D_END_OF_STREAM               FLAC__STREAM_DECODER_END_OF_STREAM
12 
13-#define d_new()                       FLAC__seekable_stream_decoder_new()
14-#define d_init(x)                     FLAC__seekable_stream_decoder_init(x)
15-#define d_process_metadata(x)         FLAC__seekable_stream_decoder_process_until_end_of_metadata(x)
16-#define d_process_one_frame(x)        FLAC__seekable_stream_decoder_process_single(x)
17-#define d_get_state(x)                FLAC__seekable_stream_decoder_get_state(x)
18-#define d_finish(x)                   FLAC__seekable_stream_decoder_finish(x)
19-#define d_delete(x)                   FLAC__seekable_stream_decoder_delete(x)
20-#define d_set_read_callback(x, y)     FLAC__seekable_stream_decoder_set_read_callback(x, y)
21-#define d_set_write_callback(x, y)    FLAC__seekable_stream_decoder_set_write_callback(x, y)
22-#define d_set_metadata_callback(x, y) FLAC__seekable_stream_decoder_set_metadata_callback(x, y)
23-#define d_set_error_callback(x, y)    FLAC__seekable_stream_decoder_set_error_callback(x, y)
24-#define d_set_client_data(x, y)       FLAC__seekable_stream_decoder_set_client_data(x, y)
25-
26-typedef FLAC__SeekableStreamDecoder           decoder_t;
27-typedef FLAC__SeekableStreamDecoderReadStatus d_read_status_t;
28-
29-#define D_SEEK_STATUS_OK              FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK
30-#define D_SEEK_STATUS_ERROR           FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR
31-#define D_TELL_STATUS_OK              FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK
32-#define D_TELL_STATUS_ERROR           FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR
33-#define D_LENGTH_STATUS_OK            FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK
34-#define D_LENGTH_STATUS_ERROR         FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR
35-
36-#define d_set_seek_callback(x, y)     FLAC__seekable_stream_decoder_set_seek_callback(x, y)
37-#define d_set_tell_callback(x, y)     FLAC__seekable_stream_decoder_set_tell_callback(x, y)
38-#define d_set_length_callback(x, y)   FLAC__seekable_stream_decoder_set_length_callback(x, y)
39-#define d_set_eof_callback(x, y)      FLAC__seekable_stream_decoder_set_eof_callback(x, y)
40-#define d_seek_absolute(x, y)         FLAC__seekable_stream_decoder_seek_absolute(x, y)
41-
42-typedef FLAC__SeekableStreamDecoderSeekStatus   d_seek_status_t;
43-typedef FLAC__SeekableStreamDecoderTellStatus   d_tell_status_t;
44-typedef FLAC__SeekableStreamDecoderLengthStatus d_length_status_t;
45+#define d_new()                       FLAC__stream_decoder_new()
46+#define d_init(x)                     FLAC__stream_decoder_init(x)
47+#define d_process_metadata(x)         FLAC__stream_decoder_process_until_end_of_metadata(x)
48+#define d_process_one_frame(x)        FLAC__stream_decoder_process_single(x)
49+#define d_get_state(x)                FLAC__stream_decoder_get_state(x)
50+#define d_finish(x)                   FLAC__stream_decoder_finish(x)
51+#define d_delete(x)                   FLAC__stream_decoder_delete(x)
52+#define d_set_read_callback(x, y)     FLAC__stream_decoder_set_read_callback(x, y)
53+#define d_set_write_callback(x, y)    FLAC__stream_decoder_set_write_callback(x, y)
54+#define d_set_metadata_callback(x, y) FLAC__stream_decoder_set_metadata_callback(x, y)
55+#define d_set_error_callback(x, y)    FLAC__stream_decoder_set_error_callback(x, y)
56+#define d_set_client_data(x, y)       FLAC__stream_decoder_set_client_data(x, y)
57+
58+typedef FLAC__StreamDecoder           decoder_t;
59+typedef FLAC__StreamDecoderReadStatus d_read_status_t;
60+
61+#define D_SEEK_STATUS_OK              FLAC__STREAM_DECODER_SEEK_STATUS_OK
62+#define D_SEEK_STATUS_ERROR           FLAC__STREAM_DECODER_SEEK_STATUS_ERROR
63+#define D_TELL_STATUS_OK              FLAC__STREAM_DECODER_TELL_STATUS_OK
64+#define D_TELL_STATUS_ERROR           FLAC__STREAM_DECODER_TELL_STATUS_ERROR
65+#define D_LENGTH_STATUS_OK            FLAC__STREAM_DECODER_LENGTH_STATUS_OK
66+#define D_LENGTH_STATUS_ERROR         FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR
67+
68+#define d_set_seek_callback(x, y)     FLAC__stream_decoder_set_seek_callback(x, y)
69+#define d_set_tell_callback(x, y)     FLAC__stream_decoder_set_tell_callback(x, y)
70+#define d_set_length_callback(x, y)   FLAC__stream_decoder_set_length_callback(x, y)
71+#define d_set_eof_callback(x, y)      FLAC__stream_decoder_set_eof_callback(x, y)
72+#define d_seek_absolute(x, y)         FLAC__stream_decoder_seek_absolute(x, y)
73+
74+typedef FLAC__StreamDecoderSeekStatus   d_seek_status_t;
75+typedef FLAC__StreamDecoderTellStatus   d_tell_status_t;
76+typedef FLAC__StreamDecoderLengthStatus d_length_status_t;
77 
78 #define D_WRITE_CONTINUE     FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE
79 #define D_READ_END_OF_STREAM FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM