cleanup: rsf.c to raw_rsf.c

src/libvgmstream.vcxproj

@@ -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" />

src/libvgmstream.vcxproj.filters

@@ -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>

src/meta/meta.h

@@ -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);
 

src/meta/raw_rsf.c

@@ -2,19 +2,17 @@
 #include "../util.h"
 #include "../coding/coding.h"
 
-/* .rsf - from Metroid Prime */
+/* .rsf - from Metroid Prime (GC) */
-
+VGMSTREAM* init_vgmstream_raw_rsf(STREAMFILE* sf) {
-VGMSTREAM* init_vgmstream_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;
 

src/vgmstream.c

@@ -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 */