Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-24 06:50:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: internal stuff

Browse Source
This commit is contained in:
bnnm 2024-07-28 17:30:38 +02:00
parent 9b81496c77
commit f0897c7868
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vgmstream.c
View File

@ -16,7 +16,7 @@
#include "util/sf_utils.h" #include "util/sf_utils.h"
static void try_dual_file_stereo(VGMSTREAM* opened_vgmstream, STREAMFILE* sf, int format_id); static void try_dual_file_stereo(VGMSTREAM* opened_vgmstream, STREAMFILE* sf);
/*****************************************************************************/ /*****************************************************************************/
@ -39,7 +39,7 @@ VGMSTREAM* init_vgmstream_from_STREAMFILE(STREAMFILE* sf) {
} }
bool prepare_vgmstream(VGMSTREAM* vgmstream, STREAMFILE* sf, int format_id) { bool prepare_vgmstream(VGMSTREAM* vgmstream, STREAMFILE* sf) {
/* fail if there is nothing/too much to play (<=0 generates empty files, >N writes GBs of garbage) */ /* fail if there is nothing/too much to play (<=0 generates empty files, >N writes GBs of garbage) */
if (vgmstream->num_samples <= 0 || vgmstream->num_samples > VGMSTREAM_MAX_NUM_SAMPLES) { if (vgmstream->num_samples <= 0 || vgmstream->num_samples > VGMSTREAM_MAX_NUM_SAMPLES) {
@ -68,7 +68,7 @@ bool prepare_vgmstream(VGMSTREAM* vgmstream, STREAMFILE* sf, int format_id) {
/* test if candidate for dual stereo */ /* test if candidate for dual stereo */
if (vgmstream->channels == 1 && vgmstream->allow_dual_stereo == 1) { if (vgmstream->channels == 1 && vgmstream->allow_dual_stereo == 1) {
try_dual_file_stereo(vgmstream, sf, format_id); try_dual_file_stereo(vgmstream, sf);
} }
@ -428,7 +428,7 @@ fail:
/* See if there is a second file which may be the second channel, given an already opened mono vgmstream. /* See if there is a second file which may be the second channel, given an already opened mono vgmstream.
* If a suitable file is found, open it and change opened_vgmstream to a stereo vgmstream. */ * If a suitable file is found, open it and change opened_vgmstream to a stereo vgmstream. */
static void try_dual_file_stereo(VGMSTREAM* opened_vgmstream, STREAMFILE* sf, int format_id) { static void try_dual_file_stereo(VGMSTREAM* opened_vgmstream, STREAMFILE* sf) {
/* filename search pairs for dual file stereo */ /* filename search pairs for dual file stereo */
static const char* const dfs_pairs[][2] = { static const char* const dfs_pairs[][2] = {
{"L","R"}, /* most common in .dsp and .vag */ {"L","R"}, /* most common in .dsp and .vag */
@ -516,7 +516,7 @@ static void try_dual_file_stereo(VGMSTREAM* opened_vgmstream, STREAMFILE* sf, in
return; return;
//;VGM_LOG("DFS: match %i filename=%s\n", dfs_pair, new_filename); //;VGM_LOG("DFS: match %i filename=%s\n", dfs_pair, new_filename);
init_vgmstream_t init_vgmstream_function = get_vgmstream_format_init(format_id); init_vgmstream_t init_vgmstream_function = get_vgmstream_format_init(opened_vgmstream->format_id);
if (init_vgmstream_function == NULL) if (init_vgmstream_function == NULL)
goto fail; goto fail;

2
src/vgmstream.h
View File

@ -177,7 +177,7 @@ typedef struct {
/* other config */ /* other config */
bool allow_dual_stereo; /* search for dual stereo (file_L.ext + file_R.ext = single stereo file) */ bool allow_dual_stereo; /* search for dual stereo (file_L.ext + file_R.ext = single stereo file) */
int format_id; /* internal format ID */
/* layout/block state */ /* layout/block state */
size_t full_block_size; /* actual data size of an entire block (ie. may be fixed, include padding/headers, etc) */ size_t full_block_size; /* actual data size of an entire block (ie. may be fixed, include padding/headers, etc) */

4
src/vgmstream_init.c
View File

@ -572,10 +572,10 @@ VGMSTREAM* detect_vgmstream_format(STREAMFILE* sf) {
if (!vgmstream) if (!vgmstream)
continue; continue;
int format_id = i + 1; vgmstream->format_id = i + 1;
/* validate + setup vgmstream */ /* validate + setup vgmstream */
if (!prepare_vgmstream(vgmstream, sf, format_id)) { if (!prepare_vgmstream(vgmstream, sf)) {
/* keep trying if wasn't valid, as simpler formats may return a vgmstream by mistake */ /* keep trying if wasn't valid, as simpler formats may return a vgmstream by mistake */
close_vgmstream(vgmstream); close_vgmstream(vgmstream);
continue; continue;

2
src/vgmstream_init.h
View File

@ -4,7 +4,7 @@
#include "meta/meta.h" #include "meta/meta.h"
#include "vgmstream.h" #include "vgmstream.h"
bool prepare_vgmstream(VGMSTREAM* vgmstream, STREAMFILE* sf, int format_id); bool prepare_vgmstream(VGMSTREAM* vgmstream, STREAMFILE* sf);
VGMSTREAM* detect_vgmstream_format(STREAMFILE* sf); VGMSTREAM* detect_vgmstream_format(STREAMFILE* sf);
init_vgmstream_t get_vgmstream_format_init(int format_id); init_vgmstream_t get_vgmstream_format_init(int format_id);