Skip to content

Commit 7370a32

Browse files
icculusicculus
committed
decoders: Mark all the decoders' implementation functions static.
1 parent d7fe5c4 commit 7370a32

12 files changed

+64
-65
lines changed

‎src/decoder_flac.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ static FLAC__StreamDecoderWriteStatus FLAC_IoWriteNoOp(const FLAC__StreamDecoder
126126
return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; // we don't need this data at this moment.
127127
}
128128

129-
bool SDLCALL FLAC_seek(void *track_userdata, Uint64 frame);
129+
static bool SDLCALL FLAC_seek(void *track_userdata, Uint64 frame);
130130

131131
static FLAC__StreamDecoderWriteStatus FLAC_IoWrite(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 *const buffer[], void *userdata)
132132
{
@@ -382,7 +382,7 @@ static bool SDLCALL FLAC_init_audio(SDL_IOStream *io, SDL_AudioSpec *spec, SDL_P
382382
return true;
383383
}
384384

385-
bool SDLCALL FLAC_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_AudioSpec *spec, SDL_PropertiesID props, void **track_userdata)
385+
static bool SDLCALL FLAC_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_AudioSpec *spec, SDL_PropertiesID props, void **track_userdata)
386386
{
387387
FLAC_TrackData *tdata = (FLAC_TrackData *) SDL_calloc(1, sizeof (*tdata));
388388
if (!tdata) {
@@ -426,7 +426,7 @@ bool SDLCALL FLAC_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_A
426426
return true;
427427
}
428428

429-
bool SDLCALL FLAC_decode(void *track_userdata, SDL_AudioStream *stream)
429+
static bool SDLCALL FLAC_decode(void *track_userdata, SDL_AudioStream *stream)
430430
{
431431
FLAC_TrackData *tdata = (FLAC_TrackData *) track_userdata;
432432
tdata->stream = stream;
@@ -440,7 +440,7 @@ bool SDLCALL FLAC_decode(void *track_userdata, SDL_AudioStream *stream)
440440
return true;
441441
}
442442

443-
bool SDLCALL FLAC_seek(void *track_userdata, Uint64 frame)
443+
static bool SDLCALL FLAC_seek(void *track_userdata, Uint64 frame)
444444
{
445445
FLAC_TrackData *tdata = (FLAC_TrackData *) track_userdata;
446446
const MIX_OggLoop *loop = &tdata->adata->loop;
@@ -475,7 +475,7 @@ bool SDLCALL FLAC_seek(void *track_userdata, Uint64 frame)
475475
return true;
476476
}
477477

478-
void SDLCALL FLAC_quit_track(void *track_userdata)
478+
static void SDLCALL FLAC_quit_track(void *track_userdata)
479479
{
480480
FLAC_TrackData *tdata = (FLAC_TrackData *) track_userdata;
481481
tdata->stream = NULL;
@@ -485,7 +485,7 @@ void SDLCALL FLAC_quit_track(void *track_userdata)
485485
SDL_free(tdata);
486486
}
487487

488-
void SDLCALL FLAC_quit_audio(void *audio_userdata)
488+
static void SDLCALL FLAC_quit_audio(void *audio_userdata)
489489
{
490490
FLAC_AudioData *adata = (FLAC_AudioData *) audio_userdata;
491491
SDL_free(adata);

‎src/decoder_fluidsynth.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ static fluid_long_long_t SoundFontTell(void *handle)
212212
}
213213

214214

215-
bool SDLCALL FLUIDSYNTH_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_AudioSpec *spec, SDL_PropertiesID props, void **track_userdata)
215+
static bool SDLCALL FLUIDSYNTH_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_AudioSpec *spec, SDL_PropertiesID props, void **track_userdata)
216216
{
217217
FLUIDSYNTH_TrackData *tdata = (FLUIDSYNTH_TrackData *) SDL_calloc(1, sizeof (*tdata));
218218
if (!tdata) {
@@ -315,7 +315,7 @@ bool SDLCALL FLUIDSYNTH_init_track(void *audio_userdata, SDL_IOStream *io, const
315315
return false;
316316
}
317317

318-
bool SDLCALL FLUIDSYNTH_decode(void *track_userdata, SDL_AudioStream *stream)
318+
static bool SDLCALL FLUIDSYNTH_decode(void *track_userdata, SDL_AudioStream *stream)
319319
{
320320
FLUIDSYNTH_TrackData *tdata = (FLUIDSYNTH_TrackData *) track_userdata;
321321

@@ -332,7 +332,7 @@ bool SDLCALL FLUIDSYNTH_decode(void *track_userdata, SDL_AudioStream *stream)
332332
return true;
333333
}
334334

335-
bool SDLCALL FLUIDSYNTH_seek(void *track_userdata, Uint64 frame)
335+
static bool SDLCALL FLUIDSYNTH_seek(void *track_userdata, Uint64 frame)
336336
{
337337
#if (FLUIDSYNTH_VERSION_MAJOR < 2)
338338
return SDL_Unsupported();
@@ -345,7 +345,7 @@ bool SDLCALL FLUIDSYNTH_seek(void *track_userdata, Uint64 frame)
345345
#endif
346346
}
347347

348-
void SDLCALL FLUIDSYNTH_quit_track(void *track_userdata)
348+
static void SDLCALL FLUIDSYNTH_quit_track(void *track_userdata)
349349
{
350350
FLUIDSYNTH_TrackData *tdata = (FLUIDSYNTH_TrackData *) track_userdata;
351351
fluidsynth.fluid_player_stop(tdata->player);
@@ -355,7 +355,7 @@ void SDLCALL FLUIDSYNTH_quit_track(void *track_userdata)
355355
SDL_free(tdata);
356356
}
357357

358-
void SDLCALL FLUIDSYNTH_quit_audio(void *audio_userdata)
358+
static void SDLCALL FLUIDSYNTH_quit_audio(void *audio_userdata)
359359
{
360360
FLUIDSYNTH_AudioData *adata = (FLUIDSYNTH_AudioData *) audio_userdata;
361361
SDL_free((void *) adata->sfdata);

‎src/decoder_gme.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ static bool SDLCALL GME_init_audio(SDL_IOStream *io, SDL_AudioSpec *spec, SDL_Pr
129129
return true;
130130
}
131131

132-
bool SDLCALL GME_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_AudioSpec *spec, SDL_PropertiesID props, void **track_userdata)
132+
static bool SDLCALL GME_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_AudioSpec *spec, SDL_PropertiesID props, void **track_userdata)
133133
{
134134
SDL_assert(audio_userdata == NULL); // no state.
135135

@@ -167,7 +167,7 @@ bool SDLCALL GME_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_Au
167167
return true;
168168
}
169169

170-
bool SDLCALL GME_decode(void *track_userdata, SDL_AudioStream *stream)
170+
static bool SDLCALL GME_decode(void *track_userdata, SDL_AudioStream *stream)
171171
{
172172
Music_Emu *emu = (Music_Emu *) track_userdata;
173173
if (gme.gme_track_ended(emu)) {
@@ -185,20 +185,20 @@ bool SDLCALL GME_decode(void *track_userdata, SDL_AudioStream *stream)
185185
return true; // had more data to decode.
186186
}
187187

188-
bool SDLCALL GME_seek(void *track_userdata, Uint64 frame)
188+
static bool SDLCALL GME_seek(void *track_userdata, Uint64 frame)
189189
{
190190
Music_Emu *emu = (Music_Emu *) track_userdata;
191191
gme_err_t err = gme.gme_seek_samples(emu, (int) frame);
192192
return err ? SDL_SetError("gme_seek_samples failed: %s", err) : true;
193193
}
194194

195-
void SDLCALL GME_quit_track(void *track_userdata)
195+
static void SDLCALL GME_quit_track(void *track_userdata)
196196
{
197197
Music_Emu *emu = (Music_Emu *) track_userdata;
198198
gme.gme_delete(emu);
199199
}
200200

201-
void SDLCALL GME_quit_audio(void *audio_userdata)
201+
static void SDLCALL GME_quit_audio(void *audio_userdata)
202202
{
203203
SDL_assert(audio_userdata == NULL); // no state.
204204
}

‎src/decoder_mpg123.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ static bool SDLCALL MPG123_init_audio(SDL_IOStream *io, SDL_AudioSpec *spec, SDL
317317
return false;
318318
}
319319

320-
bool SDLCALL MPG123_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_AudioSpec *spec, SDL_PropertiesID props, void **track_userdata)
320+
static bool SDLCALL MPG123_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_AudioSpec *spec, SDL_PropertiesID props, void **track_userdata)
321321
{
322322
SDL_assert(audio_userdata == NULL); // no state.
323323

@@ -379,7 +379,7 @@ bool SDLCALL MPG123_init_track(void *audio_userdata, SDL_IOStream *io, const SDL
379379
return true;
380380
}
381381

382-
bool SDLCALL MPG123_decode(void *track_userdata, SDL_AudioStream *stream)
382+
static bool SDLCALL MPG123_decode(void *track_userdata, SDL_AudioStream *stream)
383383
{
384384
mpg123_handle *handle = (mpg123_handle *) track_userdata;
385385
SDL_AudioSpec spec;
@@ -420,7 +420,7 @@ bool SDLCALL MPG123_decode(void *track_userdata, SDL_AudioStream *stream)
420420
return (result == MPG123_OK);
421421
}
422422

423-
bool SDLCALL MPG123_seek(void *track_userdata, Uint64 frame)
423+
static bool SDLCALL MPG123_seek(void *track_userdata, Uint64 frame)
424424
{
425425
mpg123_handle *handle = (mpg123_handle *) track_userdata;
426426
#if (MPG123_API_VERSION >= 49)
@@ -431,14 +431,14 @@ bool SDLCALL MPG123_seek(void *track_userdata, Uint64 frame)
431431
return (rc < 0) ? SDL_SetError("mpg123_seek:%s", mpg_err(handle, rc)) : true;
432432
}
433433

434-
void SDLCALL MPG123_quit_track(void *track_userdata)
434+
static void SDLCALL MPG123_quit_track(void *track_userdata)
435435
{
436436
mpg123_handle *handle = (mpg123_handle *) track_userdata;
437437
mpg123.mpg123_close(handle);
438438
mpg123.mpg123_delete(handle);
439439
}
440440

441-
void SDLCALL MPG123_quit_audio(void *audio_userdata)
441+
static void SDLCALL MPG123_quit_audio(void *audio_userdata)
442442
{
443443
SDL_assert(audio_userdata == NULL); // no state.
444444
}

‎src/decoder_opus.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ static bool SDLCALL OPUS_init_audio(SDL_IOStream *io, SDL_AudioSpec *spec, SDL_P
189189
return true;
190190
}
191191

192-
bool SDLCALL OPUS_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_AudioSpec *spec, SDL_PropertiesID props, void **track_userdata)
192+
static bool SDLCALL OPUS_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_AudioSpec *spec, SDL_PropertiesID props, void **track_userdata)
193193
{
194194
OPUS_TrackData *tdata = (OPUS_TrackData *) SDL_calloc(1, sizeof (*tdata));
195195
if (!tdata) {
@@ -216,9 +216,9 @@ bool SDLCALL OPUS_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_A
216216
return true;
217217
}
218218

219-
bool SDLCALL OPUS_seek(void *track_userdata, Uint64 frame);
219+
static bool SDLCALL OPUS_seek(void *track_userdata, Uint64 frame);
220220

221-
bool SDLCALL OPUS_decode(void *track_userdata, SDL_AudioStream *stream)
221+
static bool SDLCALL OPUS_decode(void *track_userdata, SDL_AudioStream *stream)
222222
{
223223
OPUS_TrackData *tdata = (OPUS_TrackData *) track_userdata;
224224
int bitstream = tdata->current_bitstream;
@@ -296,7 +296,7 @@ bool SDLCALL OPUS_decode(void *track_userdata, SDL_AudioStream *stream)
296296
return true; // had more data to decode.
297297
}
298298

299-
bool SDLCALL OPUS_seek(void *track_userdata, Uint64 frame)
299+
static bool SDLCALL OPUS_seek(void *track_userdata, Uint64 frame)
300300
{
301301
OPUS_TrackData *tdata = (OPUS_TrackData *) track_userdata;
302302
const MIX_OggLoop *loop = &tdata->adata->loop;
@@ -330,14 +330,14 @@ bool SDLCALL OPUS_seek(void *track_userdata, Uint64 frame)
330330
return true;
331331
}
332332

333-
void SDLCALL OPUS_quit_track(void *track_userdata)
333+
static void SDLCALL OPUS_quit_track(void *track_userdata)
334334
{
335335
OPUS_TrackData *tdata = (OPUS_TrackData *) track_userdata;
336336
opus.op_free(tdata->of);
337337
SDL_free(tdata);
338338
}
339339

340-
void SDLCALL OPUS_quit_audio(void *audio_userdata)
340+
static void SDLCALL OPUS_quit_audio(void *audio_userdata)
341341
{
342342
OPUS_AudioData *adata = (OPUS_AudioData *) audio_userdata;
343343
SDL_free(adata);

‎src/decoder_raw.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ static bool SDLCALL RAW_init_audio(SDL_IOStream *io, SDL_AudioSpec *spec, SDL_Pr
6464
return true;
6565
}
6666

67-
bool SDLCALL RAW_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_AudioSpec *spec, SDL_PropertiesID props, void **track_userdata)
67+
static bool SDLCALL RAW_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_AudioSpec *spec, SDL_PropertiesID props, void **track_userdata)
6868
{
6969
SDL_assert(audio_userdata == NULL); // no state.
7070
RAW_TrackData *tdata = (RAW_TrackData *) SDL_calloc(1, sizeof (*tdata));
@@ -81,7 +81,7 @@ bool SDLCALL RAW_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_Au
8181
return true;
8282
}
8383

84-
bool SDLCALL RAW_decode(void *track_userdata, SDL_AudioStream *stream)
84+
static bool SDLCALL RAW_decode(void *track_userdata, SDL_AudioStream *stream)
8585
{
8686
RAW_TrackData *tdata = (RAW_TrackData *) track_userdata;
8787
Uint8 buffer[256];
@@ -109,7 +109,7 @@ bool SDLCALL RAW_decode(void *track_userdata, SDL_AudioStream *stream)
109109
return true;
110110
}
111111

112-
bool SDLCALL RAW_seek(void *track_userdata, Uint64 frame)
112+
static bool SDLCALL RAW_seek(void *track_userdata, Uint64 frame)
113113
{
114114
RAW_TrackData *tdata = (RAW_TrackData *) track_userdata;
115115
const Sint64 offset = (Sint64) (frame * tdata->framesize);
@@ -120,12 +120,12 @@ bool SDLCALL RAW_seek(void *track_userdata, Uint64 frame)
120120
return true;
121121
}
122122

123-
void SDLCALL RAW_quit_track(void *track_userdata)
123+
static void SDLCALL RAW_quit_track(void *track_userdata)
124124
{
125125
SDL_free(track_userdata);
126126
}
127127

128-
void SDLCALL RAW_quit_audio(void *audio_userdata)
128+
static void SDLCALL RAW_quit_audio(void *audio_userdata)
129129
{
130130
SDL_assert(audio_userdata == NULL); // no state.
131131
}

‎src/decoder_stb_vorbis.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ static bool SDLCALL STBVORBIS_init_audio(SDL_IOStream *io, SDL_AudioSpec *spec,
185185
return true;
186186
}
187187

188-
bool SDLCALL STBVORBIS_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_AudioSpec *spec, SDL_PropertiesID props, void **track_userdata)
188+
static bool SDLCALL STBVORBIS_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_AudioSpec *spec, SDL_PropertiesID props, void **track_userdata)
189189
{
190190
STBVORBIS_TrackData *tdata = (STBVORBIS_TrackData *) SDL_calloc(1, sizeof (*tdata));
191191
if (!tdata) {
@@ -207,10 +207,9 @@ bool SDLCALL STBVORBIS_init_track(void *audio_userdata, SDL_IOStream *io, const
207207
return true;
208208
}
209209

210-
// !!! FIXME: why aren't these marked static?
211-
bool SDLCALL STBVORBIS_seek(void *track_userdata, Uint64 frame);
210+
static bool SDLCALL STBVORBIS_seek(void *track_userdata, Uint64 frame);
212211

213-
bool SDLCALL STBVORBIS_decode(void *track_userdata, SDL_AudioStream *stream)
212+
static bool SDLCALL STBVORBIS_decode(void *track_userdata, SDL_AudioStream *stream)
214213
{
215214
STBVORBIS_TrackData *tdata = (STBVORBIS_TrackData *) track_userdata;
216215

@@ -296,7 +295,7 @@ bool SDLCALL STBVORBIS_decode(void *track_userdata, SDL_AudioStream *stream)
296295
return true; // had more data to decode.
297296
}
298297

299-
bool SDLCALL STBVORBIS_seek(void *track_userdata, Uint64 frame)
298+
static bool SDLCALL STBVORBIS_seek(void *track_userdata, Uint64 frame)
300299
{
301300
STBVORBIS_TrackData *tdata = (STBVORBIS_TrackData *) track_userdata;
302301
const MIX_OggLoop *loop = &tdata->adata->loop;
@@ -330,14 +329,14 @@ bool SDLCALL STBVORBIS_seek(void *track_userdata, Uint64 frame)
330329
return true;
331330
}
332331

333-
void SDLCALL STBVORBIS_quit_track(void *track_userdata)
332+
static void SDLCALL STBVORBIS_quit_track(void *track_userdata)
334333
{
335334
STBVORBIS_TrackData *tdata = (STBVORBIS_TrackData *) track_userdata;
336335
stb_vorbis_close(tdata->vorbis);
337336
SDL_free(tdata);
338337
}
339338

340-
void SDLCALL STBVORBIS_quit_audio(void *audio_userdata)
339+
static void SDLCALL STBVORBIS_quit_audio(void *audio_userdata)
341340
{
342341
SDL_free(audio_userdata);
343342
}

‎src/decoder_timidity.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ static bool SDLCALL TIMIDITY_init_audio(SDL_IOStream *io, SDL_AudioSpec *spec, S
9999
return true;
100100
}
101101

102-
bool SDLCALL TIMIDITY_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_AudioSpec *spec, SDL_PropertiesID props, void **track_userdata)
102+
static bool SDLCALL TIMIDITY_init_track(void *audio_userdata, SDL_IOStream *io, const SDL_AudioSpec *spec, SDL_PropertiesID props, void **track_userdata)
103103
{
104104
SDL_assert(audio_userdata == NULL); // no state.
105105
TIMIDITY_TrackData *tdata = (TIMIDITY_TrackData *) SDL_calloc(1, sizeof (*tdata));
@@ -122,7 +122,7 @@ bool SDLCALL TIMIDITY_init_track(void *audio_userdata, SDL_IOStream *io, const S
122122
return true;
123123
}
124124

125-
bool SDLCALL TIMIDITY_decode(void *track_userdata, SDL_AudioStream *stream)
125+
static bool SDLCALL TIMIDITY_decode(void *track_userdata, SDL_AudioStream *stream)
126126
{
127127
TIMIDITY_TrackData *tdata = (TIMIDITY_TrackData *) track_userdata;
128128
//Sint32 samples[256]; // !!! FIXME: there's a hardcoded thing about buffer_size in our copy of timidity that needs to be fixed; it's hardcoded at the moment, so we use tdata->samples.
@@ -135,23 +135,23 @@ bool SDLCALL TIMIDITY_decode(void *track_userdata, SDL_AudioStream *stream)
135135
return true;
136136
}
137137

138-
bool SDLCALL TIMIDITY_seek(void *track_userdata, Uint64 frame)
138+
static bool SDLCALL TIMIDITY_seek(void *track_userdata, Uint64 frame)
139139
{
140140
TIMIDITY_TrackData *tdata = (TIMIDITY_TrackData *) track_userdata;
141141
const Uint32 ticks = (Uint32) MIX_FramesToMS(tdata->freq, frame);
142142
Timidity_Seek(tdata->song, ticks); // !!! FIXME: this returns void, what happens if we seek past EOF?
143143
return true;
144144
}
145145

146-
void SDLCALL TIMIDITY_quit_track(void *track_userdata)
146+
static void SDLCALL TIMIDITY_quit_track(void *track_userdata)
147147
{
148148
TIMIDITY_TrackData *tdata = (TIMIDITY_TrackData *) track_userdata;
149149
Timidity_Stop(tdata->song);
150150
Timidity_FreeSong(tdata->song);
151151
SDL_free(tdata);
152152
}
153153

154-
void SDLCALL TIMIDITY_quit_audio(void *audio_userdata)
154+
static void SDLCALL TIMIDITY_quit_audio(void *audio_userdata)
155155
{
156156
SDL_assert(audio_userdata == NULL); // no state.
157157
}

0 commit comments

Comments
 (0)