From 11c652b67e6144ac66f7b45e9942b4d963fa0542 Mon Sep 17 00:00:00 2001 From: Roman Fomin Date: Fri, 7 Apr 2023 11:33:57 +0700 Subject: [PATCH] missed `static`, cosmetic changes --- src/i_modplug.c | 4 ++-- src/i_sndfile.c | 20 +++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/i_modplug.c b/src/i_modplug.c index 9f85168c..c5b01f0f 100644 --- a/src/i_modplug.c +++ b/src/i_modplug.c @@ -24,8 +24,8 @@ static ModPlugFile *file; static ModPlug_Settings settings; -boolean I_MOD_OpenStream(void *data, ALsizei size, ALenum *format, - ALsizei *freq, ALsizei *frame_size) +static boolean I_MOD_OpenStream(void *data, ALsizei size, ALenum *format, + ALsizei *freq, ALsizei *frame_size) { ModPlug_GetSettings(&settings); settings.mFlags = MODPLUG_ENABLE_OVERSAMPLING; diff --git a/src/i_sndfile.c b/src/i_sndfile.c index aefc7d71..bceed90f 100644 --- a/src/i_sndfile.c +++ b/src/i_sndfile.c @@ -434,7 +434,6 @@ static boolean OpenFile(sndfile_t *file, void *data, sf_count_t size) if (!file->sndfile) { - fprintf(stderr, "sf_open_virtual: %s\n", sf_strerror(file->sndfile)); return false; } @@ -562,9 +561,8 @@ static sndfile_t stream; static loop_metadata_t loop; - -boolean I_SND_OpenStream(void *data, ALsizei size, ALenum *format, - ALsizei *freq, ALsizei *frame_size) +static boolean I_SND_OpenStream(void *data, ALsizei size, ALenum *format, + ALsizei *freq, ALsizei *frame_size) { MEMFILE *fs; @@ -598,14 +596,14 @@ boolean I_SND_OpenStream(void *data, ALsizei size, ALenum *format, return true; } -void I_SND_RestartStream(void) +static void I_SND_RestartStream(void) { sf_seek(stream.sndfile, loop.start_time, SEEK_SET); } -uint32_t I_SND_FillStream(byte *data, uint32_t frames) +static uint32_t I_SND_FillStream(byte *data, uint32_t frames) { - sf_count_t num_frames = 0; + sf_count_t filled = 0; boolean restart = false; if (loop.end_time) @@ -621,11 +619,11 @@ uint32_t I_SND_FillStream(byte *data, uint32_t frames) if (stream.sample_format == Int16) { - num_frames = sf_readf_short(stream.sndfile, (short *)data, frames); + filled = sf_readf_short(stream.sndfile, (short *)data, frames); } else if (stream.sample_format == Float) { - num_frames = sf_readf_float(stream.sndfile, (float *)data, frames); + filled = sf_readf_float(stream.sndfile, (float *)data, frames); } if (restart) @@ -633,10 +631,10 @@ uint32_t I_SND_FillStream(byte *data, uint32_t frames) sf_seek(stream.sndfile, loop.start_time, SEEK_SET); } - return num_frames; + return filled; } -void I_SND_CloseStream(void) +static void I_SND_CloseStream(void) { CloseFile(&stream); }