From a8163717d270b79edd43a6f57a13567a9a7f0841 Mon Sep 17 00:00:00 2001 From: bnnm Date: Sat, 10 Aug 2024 23:43:41 +0200 Subject: [PATCH] cleanup: misc --- .gitignore | 11 ++++------- cli/api_example.c | 8 ++++---- src/base/api_libsf.c | 2 +- src/base/info.c | 6 +++--- src/base/mixer_ops_fade.c | 2 +- src/base/sbuf.h | 2 +- src/libvgmstream_streamfile.h | 2 +- winamp/in_utils.c | 2 +- 8 files changed, 16 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 2e22a21b..06cca28a 100644 --- a/.gitignore +++ b/.gitignore @@ -46,8 +46,8 @@ ipch # build /version_auto.h /dependencies -/bin/**/* -/tmp/**/* +/bin +/tmp /**/vgmstream-win.zip /**/foo_input_vgmstream.fb2k-component @@ -64,10 +64,7 @@ CMakeFiles /audacious/Makefile cmake_install.cmake -#doc build -doc/INFO.md -doc/_build - +# doc stuff changelog.txt formats-info.md -__pycache__ \ No newline at end of file +__pycache__ diff --git a/cli/api_example.c b/cli/api_example.c index d7687082..0fd82286 100644 --- a/cli/api_example.c +++ b/cli/api_example.c @@ -26,7 +26,7 @@ static FILE* get_output_file(const char* filename) { } static libvgmstream_streamfile_t* get_streamfile(const char* filename) { - return libvgmstream_streamfile_from_filename(filename); + return libvgmstream_streamfile_open_from_stdio(filename); } static int api_example(const char* infile) { @@ -204,10 +204,10 @@ static libvgmstream_streamfile_t* test_libsf_open() { libvgmstream_streamfile_t* libsf = NULL; - libsf = libvgmstream_streamfile_from_filename("api.bin_wrong"); + libsf = libvgmstream_streamfile_open_from_stdio("api.bin_wrong"); assert(libsf == NULL); - libsf = libvgmstream_streamfile_from_filename("api.bin"); + libsf = libvgmstream_streamfile_open_from_stdio("api.bin"); assert(libsf != NULL); return libsf; @@ -335,7 +335,7 @@ static void test_lib_tags() { libvgmstream_tags_t* tags = NULL; bool more = false; - libsf = libvgmstream_streamfile_from_filename("sample_!tags.m3u"); + libsf = libvgmstream_streamfile_open_from_stdio("sample_!tags.m3u"); assert(libsf != NULL); tags = libvgmstream_tags_init(libsf); diff --git a/src/base/api_libsf.c b/src/base/api_libsf.c index fc9d0d06..c2318bd7 100644 --- a/src/base/api_libsf.c +++ b/src/base/api_libsf.c @@ -132,7 +132,7 @@ fail: } -LIBVGMSTREAM_API libvgmstream_streamfile_t* libvgmstream_streamfile_from_filename(const char* filename) { +LIBVGMSTREAM_API libvgmstream_streamfile_t* libvgmstream_streamfile_open_from_stdio(const char* filename) { STREAMFILE* sf = open_stdio_streamfile(filename); if (!sf) return NULL; diff --git a/src/base/info.c b/src/base/info.c index 2a7a6ec8..8929d3fa 100644 --- a/src/base/info.c +++ b/src/base/info.c @@ -52,7 +52,7 @@ void describe_vgmstream(VGMSTREAM* vgmstream, char* desc, int length) { } if (vgmstream->channel_layout) { - int cl = vgmstream->channel_layout; + uint32_t cl = vgmstream->channel_layout; /* not "channel layout: " to avoid mixups with "layout: " */ snprintf(temp,TEMPSIZE, "channel mask: 0x%x /", vgmstream->channel_layout); @@ -63,8 +63,8 @@ void describe_vgmstream(VGMSTREAM* vgmstream, char* desc, int length) { if (cl & speaker_LFE) concatn(length,desc," LFE"); if (cl & speaker_BL) concatn(length,desc," BL"); if (cl & speaker_BR) concatn(length,desc," BR"); - if (cl & speaker_FLC) concatn(length,desc," FLC"); - if (cl & speaker_FRC) concatn(length,desc," FRC"); + if (cl & speaker_FLC) concatn(length,desc," FLC"); //FCL is also common + if (cl & speaker_FRC) concatn(length,desc," FRC"); //FCR is also common if (cl & speaker_BC) concatn(length,desc," BC"); if (cl & speaker_SL) concatn(length,desc," SL"); if (cl & speaker_SR) concatn(length,desc," SR"); diff --git a/src/base/mixer_ops_fade.c b/src/base/mixer_ops_fade.c index 973f6456..f0670da0 100644 --- a/src/base/mixer_ops_fade.c +++ b/src/base/mixer_ops_fade.c @@ -34,7 +34,7 @@ static inline float get_fade_gain_curve(char shape, float index) { break; case 'Q': /* quarter of sine wave (for musical fades) */ - gain = sin(index * MIXING_PI / 2.0f); + gain = sinf(index * MIXING_PI / 2.0f); break; case 'p': /* parabola (maybe for crossfades) */ diff --git a/src/base/sbuf.h b/src/base/sbuf.h index c0e6c500..329b08f4 100644 --- a/src/base/sbuf.h +++ b/src/base/sbuf.h @@ -6,7 +6,7 @@ // TODO decide if using float 1.0 style or 32767 style (fuzzy PCM changes when doing that) static inline void sbuf_copy_s16_to_f32(float* buf_f32, int16_t* buf_s16, int samples, int channels) { for (int s = 0; s < samples * channels; s++) { - buf_f32[s] = buf_s16[s]; // / 32767.0f + buf_f32[s] = (float)buf_s16[s]; // / 32767.0f } } diff --git a/src/libvgmstream_streamfile.h b/src/libvgmstream_streamfile.h index 19fdc497..809765f4 100644 --- a/src/libvgmstream_streamfile.h +++ b/src/libvgmstream_streamfile.h @@ -60,7 +60,7 @@ static inline void libvgmstream_streamfile_close(libvgmstream_streamfile_t* libs } -LIBVGMSTREAM_API libvgmstream_streamfile_t* libvgmstream_streamfile_from_filename(const char* filename); +LIBVGMSTREAM_API libvgmstream_streamfile_t* libvgmstream_streamfile_open_from_stdio(const char* filename); #endif #endif diff --git a/winamp/in_utils.c b/winamp/in_utils.c index 57358510..6b96ed26 100644 --- a/winamp/in_utils.c +++ b/winamp/in_utils.c @@ -40,7 +40,7 @@ void build_extension_list(char* winamp_list, int winamp_list_size) { for (i = 0; i < ext_list_len; i++) { int used = add_extension(winamp_list, winamp_list_size - description_size, ext_list[i]); if (used <= 0) { - vgm_logi("build_extension_list: not enough buf for all exts\n"); + //vgm_logi("build_extension_list: not enough buf for all exts\n"); break; } winamp_list += used;