cleanup: rename adp_bos to adp_wildfire

src/formats.c

@@ -1031,8 +1031,7 @@ static const meta_info meta_info_list[] = {
         {meta_AIFC,                 "Apple AIFF-C (Audio Interchange File Format) header"},
         {meta_AIFF,                 "Apple AIFF (Audio Interchange File Format) header"},
         {meta_STR_SNDS,             "3DO SNDS header"},
-        {meta_WS_AUD,               "Westwood Studios .aud header"},
+        {meta_WS_AUD,               "Westwood Studios .AUD header"},
-        {meta_WS_AUD_old,           "Westwood Studios .aud (old) header"},
         {meta_PS2_IVB,              "IVB/BVII header"},
         {meta_SVS,                  "Square SVS header"},
         {meta_RIFF_WAVE,            "RIFF WAVE header"},
@@ -1218,7 +1217,7 @@ static const meta_info meta_info_list[] = {
         {meta_PS2_WMUS,             "assumed The Warriors Sony ADPCM by .wmus extension"},
         {meta_HYPERSCAN_KVAG,       "Mattel Hyperscan KVAG"},
         {meta_IOS_PSND,             "PSND Header"},
-        {meta_BOS_ADP,              "ADP! header"},
+        {meta_ADP_WILDFIRE,         "Wildfire ADP! header"},
         {meta_QD_ADP,               "Quantic Dream .ADP header"},
         {meta_EB_SFX,               "Excitebots .sfx header"},
         {meta_EB_SF0,               "assumed Excitebots .sf0 by extension"},

src/libvgmstream.vcxproj

@@ -335,9 +335,9 @@
     <ClCompile Include="meta\acx.c" />
     <ClCompile Include="meta\adm3.c" />
     <ClCompile Include="meta\adpcm_capcom.c" />
-    <ClCompile Include="meta\adp_bos.c" />
     <ClCompile Include="meta\adp_konami.c" />
     <ClCompile Include="meta\adp_qd.c" />
+    <ClCompile Include="meta\adp_wildfire.c" />
     <ClCompile Include="meta\ads.c" />
     <ClCompile Include="meta\ads_midway.c" />
     <ClCompile Include="meta\adx.c" />

src/libvgmstream.vcxproj.filters

@@ -826,15 +826,15 @@
     <ClCompile Include="meta\adpcm_capcom.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta\adp_bos.c">
-      <Filter>meta\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="meta\adp_konami.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="meta\adp_qd.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="meta\adp_wildfire.c">
+      <Filter>meta\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="meta\ads.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>

src/meta/adp_wildfire.c

@@ -1,18 +1,18 @@
 #include "meta.h"
 
-/* ADP - from Balls of Steel */
+/* ADP - from Wildfire Studios games [Balls of Steel (PC)] */
-VGMSTREAM* init_vgmstream_adp_bos(STREAMFILE* sf) {
+VGMSTREAM* init_vgmstream_adp_wildfire(STREAMFILE* sf) {
     VGMSTREAM* vgmstream = NULL;
-    off_t start_offset;
+    uint32_t start_offset;
-    int loop_flag = 0;
+    int channels, loop_flag = 0;
-    int channels;
 
     /* checks */
-    if (!check_extensions(sf,"adp"))
-        goto fail;
-
     if (!is_id32be(0x00,sf, "ADP!"))
-        goto fail;
+        return NULL;
+
+    if (!check_extensions(sf,"adp"))
+        return NULL;
+
 
     loop_flag = (-1 != read_s32le(0x08,sf));
     channels = 1;
@@ -30,7 +30,7 @@ VGMSTREAM* init_vgmstream_adp_bos(STREAMFILE* sf) {
 
     vgmstream->coding_type = coding_DVI_IMA_int;
     vgmstream->layout_type = layout_none;
-    vgmstream->meta_type = meta_BOS_ADP;
+    vgmstream->meta_type = meta_ADP_WILDFIRE;
 
     // 0x10, 0x12 - both initial history?
     //vgmstream->ch[0].adpcm_history1_32 = read_16bitLE(0x10,sf);

src/meta/meta.h

@@ -519,7 +519,7 @@ VGMSTREAM * init_vgmstream_hyperscan_kvag(STREAMFILE* streamFile);
 
 VGMSTREAM * init_vgmstream_ios_psnd(STREAMFILE* streamFile);
 
-VGMSTREAM* init_vgmstream_adp_bos(STREAMFILE* sf);
+VGMSTREAM* init_vgmstream_adp_wildfire(STREAMFILE* sf);
 
 VGMSTREAM* init_vgmstream_adp_qd(STREAMFILE* sf);
 

src/vgmstream.c

@@ -245,7 +245,7 @@ init_vgmstream_t init_vgmstream_functions[] = {
     init_vgmstream_xwav_old,
     init_vgmstream_hyperscan_kvag,
     init_vgmstream_ios_psnd,
-    init_vgmstream_adp_bos,
+    init_vgmstream_adp_wildfire,
     init_vgmstream_adp_qd,
     init_vgmstream_eb_sfx,
     init_vgmstream_eb_sf0,

src/vgmstream_types.h

@@ -410,8 +410,7 @@ typedef enum {
     meta_AIFC,              /* Audio Interchange File Format AIFF-C */
     meta_AIFF,              /* Audio Interchange File Format */
     meta_STR_SNDS,          /* .str with SNDS blocks and SHDR header */
-    meta_WS_AUD,            /* Westwood Studios .aud */
+    meta_WS_AUD,
-    meta_WS_AUD_old,        /* Westwood Studios .aud, old style */
     meta_RIFF_WAVE,         /* RIFF, for WAVs */
     meta_RIFF_WAVE_POS,     /* .wav + .pos for looping (Ys Complete PC) */
     meta_RIFF_WAVE_labl,    /* RIFF w/ loop Markers in LIST-adtl-labl */
@@ -506,7 +505,7 @@ typedef enum {
     meta_PS2_WMUS,          /* The Warriors (PS2) */
     meta_HYPERSCAN_KVAG,    /* Hyperscan KVAG/BVG */
     meta_IOS_PSND,          /* Crash Bandicoot Nitro Kart 2 (iOS) */
-    meta_BOS_ADP,
+    meta_ADP_WILDFIRE,
     meta_QD_ADP,
     meta_EB_SFX,            /* Excitebots .sfx */
     meta_EB_SF0,            /* Excitebots .sf0 */