]>
Commit | Line | Data |
---|---|---|
8efe1232 JB |
1 | --- freecraft-020630/src/sound/flac.c.orig Sun Jun 16 18:52:49 2002 |
2 | +++ freecraft-020630/src/sound/flac.c Sun Dec 22 21:38:31 2002 | |
3 | @@ -96,10 +96,10 @@ | |
4 | if ((i = CLread(f, buffer, *bytes)) != *bytes) { | |
5 | *bytes = i; | |
6 | if (!i) { | |
7 | - return FLAC__STREAM_DECODER_READ_END_OF_STREAM; | |
8 | + return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM; | |
9 | } | |
10 | } | |
11 | - return FLAC__STREAM_DECODER_READ_CONTINUE; | |
12 | + return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE; | |
13 | } | |
14 | ||
15 | /** | |
16 | @@ -111,7 +111,7 @@ | |
17 | */ | |
18 | local void FLAC_metadata_callback( | |
19 | const FLAC__StreamDecoder * stream __attribute__((unused)), | |
20 | - const FLAC__StreamMetaData * metadata, void *user) | |
21 | + const FLAC__StreamMetadata * metadata, void *user) | |
22 | { | |
23 | Sample *sample; | |
24 | ||
25 | @@ -139,7 +139,7 @@ | |
26 | */ | |
27 | local FLAC__StreamDecoderWriteStatus FLAC_write_callback(const | |
28 | FLAC__StreamDecoder * stream __attribute__((unused)), | |
29 | - const FLAC__Frame * frame, const FLAC__int32 * buffer[], void *user) | |
30 | + const FLAC__Frame * frame, const FLAC__int32 * const buffer[], void *user) | |
31 | { | |
32 | Sample *sample; | |
33 | int i; | |
34 | @@ -187,7 +187,7 @@ | |
35 | ExitFatal(-1); | |
36 | } | |
37 | ||
38 | - return FLAC__STREAM_DECODER_WRITE_CONTINUE; | |
39 | + return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; | |
40 | } | |
41 | ||
42 | /** |