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

cleanup: rsf.c to raw_rsf.c

Browse Source
This commit is contained in:
bnnm 2023-06-24 16:40:17 +02:00
parent 543ff1d953
commit 7e5ebbda2a
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libvgmstream.vcxproj
View File

@ -594,6 +594,8 @@
<ClCompile Include="meta\rad.c" />
<ClCompile Include="meta\raw_int.c" />
<ClCompile Include="meta\raw_pcm.c" />
<ClCompile Include="meta\raw_rsf.c" />
<ClCompile Include="meta\raw_s14_sss.c" />
<ClCompile Include="meta\raw_snds.c" />
<ClCompile Include="meta\raw_wavm.c" />
<ClCompile Include="meta\redspark.c" />
@ -602,12 +604,10 @@
<ClCompile Include="meta\rkv.c" />
<ClCompile Include="meta\rs03.c" />
<ClCompile Include="meta\rsd.c" />
<ClCompile Include="meta\rsf.c" />
<ClCompile Include="meta\rwax.c" />
<ClCompile Include="meta\rws.c" />
<ClCompile Include="meta\rwsd.c" />
<ClCompile Include="meta\rwx.c" />
<ClCompile Include="meta\rxws.c" />
<ClCompile Include="meta\s14_sss.c" />
<ClCompile Include="meta\s3v.c" />
<ClCompile Include="meta\sab.c" />
<ClCompile Include="meta\sadf.c" />

14
src/libvgmstream.vcxproj.filters
View File

@ -1603,6 +1603,12 @@
<ClCompile Include="meta\raw_pcm.c">
<Filter>meta\Source Files</Filter>
</ClCompile>
<ClCompile Include="meta\raw_rsf.c">
<Filter>meta\Source Files</Filter>
</ClCompile>
<ClCompile Include="meta\raw_s14_sss.c">
<Filter>meta\Source Files</Filter>
</ClCompile>
<ClCompile Include="meta\raw_snds.c">
<Filter>meta\Source Files</Filter>
</ClCompile>
@ -1627,7 +1633,7 @@
<ClCompile Include="meta\rsd.c">
<Filter>meta\Source Files</Filter>
</ClCompile>
<ClCompile Include="meta\rsf.c">
<ClCompile Include="meta\rwax.c">
<Filter>meta\Source Files</Filter>
</ClCompile>
<ClCompile Include="meta\rws.c">
@ -1636,15 +1642,9 @@
<ClCompile Include="meta\rwsd.c">
<Filter>meta\Source Files</Filter>
</ClCompile>
<ClCompile Include="meta\rwx.c">
<Filter>meta\Source Files</Filter>
</ClCompile>
<ClCompile Include="meta\rxws.c">
<Filter>meta\Source Files</Filter>
</ClCompile>
<ClCompile Include="meta\s14_sss.c">
<Filter>meta\Source Files</Filter>
</ClCompile>
<ClCompile Include="meta\s3v.c">
<Filter>meta\Source Files</Filter>
</ClCompile>

2
src/meta/meta.h
View File

@ -82,7 +82,7 @@ VGMSTREAM * init_vgmstream_nps(STREAMFILE *streamFile);
VGMSTREAM * init_vgmstream_rs03(STREAMFILE *streamFile);
VGMSTREAM* init_vgmstream_rsf(STREAMFILE* sf);
VGMSTREAM* init_vgmstream_raw_rsf(STREAMFILE* sf);
VGMSTREAM * init_vgmstream_rwsd(STREAMFILE *streamFile);

8
src/meta/rsf.c → src/meta/raw_rsf.c
View File

@ -2,19 +2,17 @@
#include "../util.h"
#include "../coding/coding.h"
/* .rsf - from Metroid Prime */
VGMSTREAM* init_vgmstream_rsf(STREAMFILE* sf) {
/* .rsf - from Metroid Prime (GC) */
VGMSTREAM* init_vgmstream_raw_rsf(STREAMFILE* sf) {
VGMSTREAM* vgmstream = NULL;
int channels, loop_flag;
uint32_t interleave, file_size;
/* checks */
if (!check_extensions(sf,"rsf"))
goto fail;
return NULL;
/* this is all we have to go on, rsf is completely headerless */
file_size = get_streamfile_size(sf);
interleave = (file_size + 1) / 2;

2
src/vgmstream.c
View File

@ -531,7 +531,6 @@ init_vgmstream_t init_vgmstream_functions[] = {
/* lower priority metas (no clean header identity, somewhat ambiguous, or need extension/companion file to identify) */
init_vgmstream_scd_pcm,
init_vgmstream_agsc,
init_vgmstream_rsf,
init_vgmstream_ps2_wmus,
init_vgmstream_mib_mih,
init_vgmstream_mjb_mjh,
@ -547,6 +546,7 @@ init_vgmstream_t init_vgmstream_functions[] = {
init_vgmstream_mpeg, /* semi-raw MP3 */
init_vgmstream_btsnd, /* semi-headerless */
init_vgmstream_encrypted, /* encrypted stuff */
init_vgmstream_raw_rsf, /* raw GC streamed files */
init_vgmstream_raw_int, /* .int raw PCM */
init_vgmstream_ps_headerless, /* tries to detect a bunch of PS-ADPCM formats */
init_vgmstream_raw_snds, /* .snds raw SNDS IMA */