Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-01-18 15:54:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: tweaks

Browse Source
This commit is contained in:
bnnm 2023-06-25 23:33:00 +02:00
parent 5d9b4ed827
commit b916b5165a
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/meta/ngc_dsp_std.c
View File

@ -301,13 +301,13 @@ VGMSTREAM* init_vgmstream_ngc_dsp_std(STREAMFILE* sf) {
/* checks */
if (!read_dsp_header_be(&header, 0x00, sf))
goto fail;
return NULL;
/* .dsp: standard
* .adp: Dr. Muto/Battalion Wars (GC), Tale of Despereaux (Wii)
* (extensionless): Tony Hawk's Downhill Jam (Wii) */
if (!check_extensions(sf, "dsp,adp,"))
goto fail;
return NULL;
channels = 1;
start_offset = header_size;
@ -418,12 +418,11 @@ VGMSTREAM* init_vgmstream_ngc_dsp_std_le(STREAMFILE* sf) {
int i, channels;
/* checks */
if (!read_dsp_header_le(&header, 0x00, sf))
return NULL;
/* .adpcm: LEGO Worlds */
if (!check_extensions(sf, "adpcm"))
goto fail;
if (!read_dsp_header_le(&header, 0x00, sf))
goto fail;
return NULL;
channels = 1;
start_offset = header_size;
@ -503,10 +502,9 @@ VGMSTREAM* init_vgmstream_ngc_mdsp_std(STREAMFILE* sf) {
/* checks */
if (!read_dsp_header_be(&header, 0x00, sf))
goto fail;
return NULL;
if (!check_extensions(sf, "dsp,mdsp"))
goto fail;
return NULL;
channels = header.channels==0 ? 1 : header.channels;
start_offset = header_size * channels;

6
src/meta/sli.c
View File

@ -12,8 +12,12 @@ VGMSTREAM* init_vgmstream_sli_loops(STREAMFILE* sf) {
VGMSTREAM* (*init_vgmstream)(STREAMFILE* sf) = NULL;
/* checks */
/* V1: fixed to 0x900?
* V2: varies with text size but around 0xC0 */
if (get_streamfile_size(sf) > 0x2000)
return NULL;
if (!check_extensions(sf, "sli"))
goto fail;
return NULL;
{
/* try with file.ogg/opus/wav.sli=header and file.ogg/opus/wav=data */

9
src/vgmstream.c
View File

@ -68,7 +68,6 @@ init_vgmstream_t init_vgmstream_functions[] = {
init_vgmstream_svs,
init_vgmstream_riff,
init_vgmstream_rifx,
init_vgmstream_pos,
init_vgmstream_nwa,
init_vgmstream_ea_1snh,
init_vgmstream_ea_eacs,
@ -339,7 +338,6 @@ init_vgmstream_t init_vgmstream_functions[] = {
init_vgmstream_flx,
init_vgmstream_mogg,
init_vgmstream_kma9,
init_vgmstream_fsb_encrypted,
init_vgmstream_xwc,
init_vgmstream_atsl,
init_vgmstream_sps_n1,
@ -378,7 +376,6 @@ init_vgmstream_t init_vgmstream_functions[] = {
init_vgmstream_hd3_bd3,
init_vgmstream_bnk_sony,
init_vgmstream_nus3bank,
init_vgmstream_nus3bank_encrypted,
init_vgmstream_sscf,
init_vgmstream_dsp_sps_n1,
init_vgmstream_dsp_itl_ch,
@ -536,14 +533,18 @@ init_vgmstream_t init_vgmstream_functions[] = {
init_vgmstream_mjb_mjh,
init_vgmstream_mic_koei,
init_vgmstream_seb,
init_vgmstream_sli_loops,
init_vgmstream_tgc,
/* need companion files */
init_vgmstream_pos,
init_vgmstream_sli_loops,
/* lowest priority metas (should go after all metas, and TXTH should go before raw formats) */
init_vgmstream_txth, /* proper parsers should supersede TXTH, once added */
init_vgmstream_dtk, /* semi-raw GC streamed files */
init_vgmstream_mpeg, /* semi-raw MP3 */
init_vgmstream_btsnd, /* semi-headerless */
init_vgmstream_fsb_encrypted,
init_vgmstream_nus3bank_encrypted,
init_vgmstream_encrypted, /* encrypted stuff */
init_vgmstream_raw_rsf, /* raw GC streamed files */
init_vgmstream_raw_int, /* .int raw PCM */