cleanup: remove xvas/ngc_dsp_konami.c (moved to vas_kceo.c)

src/formats.c

@@ -956,7 +956,7 @@ static const layout_info layout_info_list[] = {
         {layout_blocked_ea_1snh,        "blocked (EA 1SNh)"},
         {layout_blocked_caf,            "blocked (CAF)"},
         {layout_blocked_wsi,            "blocked (WSI)"},
-        {layout_blocked_xvas,           "blocked (.xvas)"},
+        {layout_blocked_xvas,           "blocked (.vas)"},
         {layout_blocked_str_snds,       "blocked (.str SNDS)"},
         {layout_blocked_ws_aud,         "blocked (Westwood Studios .aud)"},
         {layout_blocked_dec,            "blocked (DEC)"},
@@ -1110,7 +1110,6 @@ static const meta_info meta_info_list[] = {
         {meta_STR_SEGA,             "Sega Stream Asset Builder header"},
         {meta_STR_SEGA_custom,      "Sega Stream Asset Builder header (custom)"},
         {meta_XMU,                  "Outrage XMU header"},
-        {meta_XVAS,                 "Konami .XVAS header"},
         {meta_XA2_ACCLAIM,          "Acclaim .XA2 header"},
         {meta_SAP,                  "VING .SAP header"},
         {meta_DC_IDVI,              "Capcom IDVI header"},
@@ -1191,7 +1190,6 @@ static const meta_info meta_info_list[] = {
         {meta_PONA_3DO,             "Policenauts BGM header"},
         {meta_PONA_PSX,             "Policenauts BGM header"},
         {meta_NGC_DSP_AAAP,         "Acclaim Austin AAAp DSP header"},
-        {meta_NGC_DSP_KONAMI,       "Konami DSP header"},
         {meta_BNSF,                 "Namco Bandai BNSF header"},
         {meta_WB,                   "Triangle Service .WB header"},
         {meta_S14,                  "Namco .S14 raw header"},

src/libvgmstream.vcxproj

@@ -91,6 +91,7 @@
     <ClInclude Include="vgmstream_types.h" />
     <ClInclude Include="base\api_internal.h" />
     <ClInclude Include="base\decode.h" />
+    <ClInclude Include="base\decode_state.h" />
     <ClInclude Include="base\mixer.h" />
     <ClInclude Include="base\mixer_priv.h" />
     <ClInclude Include="base\mixing.h" />
@@ -577,7 +578,6 @@
     <ClCompile Include="meta\nds_strm_ffta2.c" />
     <ClCompile Include="meta\ngc_adpdtk.c" />
     <ClCompile Include="meta\ngc_dsp_asura.c" />
-    <ClCompile Include="meta\ngc_dsp_konami.c" />
     <ClCompile Include="meta\ngc_dsp_mpds.c" />
     <ClCompile Include="meta\ngc_dsp_std.c" />
     <ClCompile Include="meta\ngc_ffcc_str.c" />
@@ -784,7 +784,6 @@
     <ClCompile Include="meta\xss.c" />
     <ClCompile Include="meta\xssb.c" />
     <ClCompile Include="meta\xvag.c" />
-    <ClCompile Include="meta\xvas.c" />
     <ClCompile Include="meta\xwav.c" />
     <ClCompile Include="meta\xwb.c" />
     <ClCompile Include="meta\xwc.c" />

src/libvgmstream.vcxproj.filters

@@ -107,6 +107,9 @@
     <ClInclude Include="base\decode.h">
       <Filter>base\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="base\decode_state.h">
+      <Filter>base\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="base\mixer.h">
       <Filter>base\Header Files</Filter>
     </ClInclude>
@@ -1561,9 +1564,6 @@
     <ClCompile Include="meta\ngc_dsp_asura.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta\ngc_dsp_konami.c">
-      <Filter>meta\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="meta\ngc_dsp_mpds.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
@@ -2182,9 +2182,6 @@
     <ClCompile Include="meta\xvag.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta\xvas.c">
-      <Filter>meta\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="meta\xwav.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>

src/meta/meta.h

@@ -271,8 +271,6 @@ VGMSTREAM* init_vgmstream_vs_mh(STREAMFILE* sf);
 
 VGMSTREAM * init_vgmstream_xmu(STREAMFILE *streamFile);
 
-VGMSTREAM * init_vgmstream_xvas(STREAMFILE *streamFile);
-
 VGMSTREAM * init_vgmstream_sat_sap(STREAMFILE *streamFile);
 
 VGMSTREAM * init_vgmstream_dc_idvi(STREAMFILE *streamFile);
@@ -427,8 +425,6 @@ VGMSTREAM* init_vgmstream_ast_mmv(STREAMFILE* sf);
 
 VGMSTREAM * init_vgmstream_dmsg(STREAMFILE* streamFile);
 
-VGMSTREAM * init_vgmstream_ngc_dsp_konami(STREAMFILE* streamFile);
-
 VGMSTREAM * init_vgmstream_bnsf(STREAMFILE* streamFile);
 
 VGMSTREAM* init_vgmstream_wb(STREAMFILE* sf);

src/meta/ngc_dsp_konami.c

@@ -1,78 +0,0 @@
-#include "meta.h"
-#include "../util.h"
-
-/* DSP
-	Teenage Mutant Ninja Turtles 2 (NGC)
-*/
-VGMSTREAM * init_vgmstream_ngc_dsp_konami(STREAMFILE *streamFile) {
-    VGMSTREAM * vgmstream = NULL;
-    char filename[PATH_LIMIT];
-    int loop_flag = 0;
-	int channel_count;
-    int i, j;
-    off_t ch1_start;
-    off_t ch2_start;
-    off_t coef_table[2] = {0x90, 0xD0};
-
-    /* check extension, case insensitive */
-    streamFile->get_name(streamFile,filename,sizeof(filename));
-    if (strcasecmp("dsp",filename_extension(filename)))
-				goto fail;
-
-    /* check header */
-    if ((read_32bitBE(0x00,streamFile)+0x800) != (get_streamfile_size(streamFile)))
-				goto fail;
-
-    loop_flag = (read_32bitBE(0x10,streamFile) != 0x0);
-    channel_count = 2;
-
-	  /* build the VGMSTREAM */
-    vgmstream = allocate_vgmstream(channel_count,loop_flag);
-    if (!vgmstream) goto fail;
-
-	  /* fill in the vital statistics */
-		vgmstream->channels = channel_count;
-    vgmstream->sample_rate = read_32bitBE(0x04,streamFile);
-    vgmstream->coding_type = coding_NGC_DSP;
-    vgmstream->num_samples = (read_32bitBE(0x00,streamFile)/channel_count/8*14);
-    if (loop_flag) {
-        vgmstream->loop_start_sample = (read_32bitBE(0x14,streamFile)/channel_count/8*14);
-        vgmstream->loop_end_sample = (read_32bitBE(0x00,streamFile)/channel_count/8*14);
-    }
-
-    vgmstream->layout_type = layout_interleave;
-    vgmstream->interleave_block_size = 0x100;
-    vgmstream->meta_type = meta_NGC_DSP_KONAMI;
-
-    ch1_start = 0x800;
-    ch2_start = 0x800 + vgmstream->interleave_block_size;
-
-    // COEFFS
-		{
-			for (j=0;j<vgmstream->channels;j++) {
-				for (i=0;i<16;i++) {
-					vgmstream->ch[j].adpcm_coef[i] = read_16bitBE(coef_table[j]+i*2,streamFile);
-				}
-			}
-		}
-
-    /* open the file for reading */
-    /* Channel 1 */
-    vgmstream->ch[0].streamfile = streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE);
-    if (!vgmstream->ch[0].streamfile)
-    	goto fail;
-    vgmstream->ch[0].channel_start_offset = vgmstream->ch[0].offset=ch1_start;
-    
-    /* Channel 1 */
-    vgmstream->ch[1].streamfile = streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE);
-    if (!vgmstream->ch[1].streamfile)
-    	goto fail;
-    vgmstream->ch[1].channel_start_offset = vgmstream->ch[1].offset=ch2_start;
-
-    return vgmstream;
-
-fail:
-    /* clean up anything we may have opened */
-    if (vgmstream) close_vgmstream(vgmstream);
-    return NULL;
-}

src/meta/xvas.c

@@ -1,51 +0,0 @@
-#include "meta.h"
-#include "../layout/layout.h"
-#include "../coding/coding.h"
-
-/* XVAS - found in TMNT 2 & TMNT 3 (Xbox) */
-VGMSTREAM * init_vgmstream_xvas(STREAMFILE *streamFile) {
-    VGMSTREAM * vgmstream = NULL;
-    off_t start_offset;
-    int loop_flag, channel_count;
-    size_t data_size;
-
-
-    /* checks */
-    if (!check_extensions(streamFile,"xvas"))
-        goto fail;
-    if (read_32bitLE(0x00,streamFile) != 0x69 && /* codec */
-        read_32bitLE(0x08,streamFile) != 0x48)   /* block size (probably 0x24 for mono) */
-        goto fail;
-
-    start_offset = 0x800;
-    channel_count = read_32bitLE(0x04,streamFile); /* always stereo files */
-    loop_flag = (read_32bitLE(0x14,streamFile) == read_32bitLE(0x24,streamFile));
-    data_size = read_32bitLE(0x24,streamFile);
-    data_size -= (data_size / 0x20000) * 0x20; /* blocks of 0x20000 with padding */
-
-
-    /* build the VGMSTREAM */
-    vgmstream = allocate_vgmstream(channel_count,loop_flag);
-    if (!vgmstream) goto fail;
-
-    vgmstream->meta_type = meta_XVAS;
-    vgmstream->sample_rate = read_32bitLE(0x0c,streamFile);
-    vgmstream->num_samples = xbox_ima_bytes_to_samples(data_size, vgmstream->channels);
-    if(loop_flag) {
-        size_t loop_size = read_32bitLE(0x10,streamFile);
-        loop_size -= (loop_size / 0x20000) * 0x20;
-        vgmstream->loop_start_sample = xbox_ima_bytes_to_samples(loop_size, vgmstream->channels);
-        vgmstream->loop_end_sample = vgmstream->num_samples;
-    }
-
-    vgmstream->coding_type = coding_XBOX_IMA;
-    vgmstream->layout_type = layout_blocked_xvas;
-
-    if (!vgmstream_open_stream(vgmstream, streamFile, start_offset))
-        goto fail;
-    return vgmstream;
-
-fail:
-    close_vgmstream(vgmstream);
-    return NULL;
-}

src/vgmstream_init.c

@@ -90,7 +90,6 @@ init_vgmstream_t init_vgmstream_functions[] = {
     init_vgmstream_str_sega_custom,
     init_vgmstream_dec,
     init_vgmstream_xmu,
-    init_vgmstream_xvas,
     init_vgmstream_sat_sap,
     init_vgmstream_dc_idvi,
     init_vgmstream_ps2_rnd,
@@ -174,7 +173,6 @@ init_vgmstream_t init_vgmstream_functions[] = {
     init_vgmstream_ast_mv,
     init_vgmstream_dmsg,
     init_vgmstream_ngc_dsp_aaap,
-    init_vgmstream_ngc_dsp_konami,
     init_vgmstream_wb,
     init_vgmstream_bnsf,
     init_vgmstream_ps2_gcm,

src/vgmstream_types.h

@@ -391,12 +391,10 @@ typedef enum {
     meta_PS2_VSF_TTA,       /* Tiny Toon Adventures: Defenders of the Universe */
     meta_ADS_MIDWAY,
     meta_PS2_SPS,           /* Ape Escape 2 */
-    meta_NGC_DSP_KONAMI,    /* Konami DSP header, found in various games */
     meta_UBI_CKD,           /* Ubisoft CKD RIFF header (Rayman Origins Wii) */
     meta_RAW_WAVM,
     meta_WVS,
     meta_XMU,
-    meta_XVAS,
     meta_EA_SCHL,           /* Electronic Arts SCHl with variable header */
     meta_EA_SCHL_fixed,     /* Electronic Arts SCHl with fixed header */
     meta_EA_BNK,            /* Electronic Arts BNK */