Remove fake format .capdsp (use TXTH)

doc/FORMATS.md

@@ -69,7 +69,6 @@ This list is not complete and many other files are supported.
 	- .asr
 	- .bns
 	- .bo2
-	- .capdsp
 	- .cfn
 	- .ddsp
 	- .dsp

src/formats.c

@@ -129,7 +129,6 @@ static const char* extension_list[] = {
     "bwav",
 
     "caf",
-    "capdsp",
     "cbd2",
     "ccc",
     "cd",
@@ -1153,7 +1152,6 @@ static const meta_info meta_info_list[] = {
         {meta_HIS,                  "Her Interactive HIS header"},
         {meta_AST_MV,               "MicroVision AST header"},
         {meta_AST_MMV,              "Marvelous AST header"},
-        {meta_CAPDSP,               "Capcom DSP header"},
         {meta_DMSG,                 "Microsoft RIFF DMSG header"},
         {meta_PONA_3DO,             "Policenauts BGM header"},
         {meta_PONA_PSX,             "Policenauts BGM header"},

src/libvgmstream.vcxproj

@@ -337,7 +337,6 @@
     <ClCompile Include="meta\brstm.c" />
     <ClCompile Include="meta\btsnd.c" />
     <ClCompile Include="meta\bsf.c" />
-    <ClCompile Include="meta\capdsp.c" />
     <ClCompile Include="meta\ck.c" />
     <ClCompile Include="meta\compresswave.c" />
     <ClCompile Include="meta\cpk.c" />

src/libvgmstream.vcxproj.filters

@@ -478,9 +478,6 @@
     <ClCompile Include="meta\bsf.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta\capdsp.c">
-      <Filter>meta\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="meta\ck.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>

src/meta/capdsp.c

@@ -1,68 +0,0 @@
-#include "meta.h"
-#include "../util.h"
-
-/* CAPDSP (found in Capcom games) */
-VGMSTREAM * init_vgmstream_capdsp(STREAMFILE *streamFile) {
-    VGMSTREAM * vgmstream = NULL;
-    char filename[PATH_LIMIT];
-    off_t start_offset;
-    int loop_flag;
-	int channel_count;
-
-    /* check extension, case insensitive */
-    streamFile->get_name(streamFile,filename,sizeof(filename));
-    if (strcasecmp("capdsp",filename_extension(filename))) goto fail;
-
-    loop_flag = (read_32bitBE(0x14,streamFile) !=2);
-    channel_count = read_32bitBE(0x10,streamFile);
-    
-	/* build the VGMSTREAM */
-    vgmstream = allocate_vgmstream(channel_count,loop_flag);
-    if (!vgmstream) goto fail;
-
-	/* fill in the vital statistics */
-    start_offset = 0x80;
-	vgmstream->channels = channel_count;
-    vgmstream->sample_rate = read_32bitBE(0x0C,streamFile);
-    vgmstream->coding_type = coding_NGC_DSP;
-    vgmstream->num_samples = read_32bitBE(0x04,streamFile);
-    if (loop_flag) {
-        vgmstream->loop_start_sample = read_32bitBE(0x14,streamFile)/8/channel_count*14;
-        vgmstream->loop_end_sample = read_32bitBE(0x18,streamFile)/8/channel_count*14;
-    }
-
-    vgmstream->layout_type = layout_interleave;
-    vgmstream->interleave_block_size = 0x4000;
-    vgmstream->meta_type = meta_CAPDSP;
-
-    if (vgmstream->coding_type == coding_NGC_DSP) {
-        int i;
-        for (i=0;i<8;i++) {
-			vgmstream->ch[0].adpcm_coef[i*2]=read_16bitBE(0x20+i*2,streamFile);
-			vgmstream->ch[0].adpcm_coef[i*2+1]=read_16bitBE(0x30+i*2,streamFile);
-			vgmstream->ch[1].adpcm_coef[i*2]=read_16bitBE(0x40+i*2,streamFile);
-			vgmstream->ch[1].adpcm_coef[i*2+1]=read_16bitBE(0x50+i*2,streamFile);
-        }
-    }
-
-    /* open the file for reading */
-    {
-        int i;
-        STREAMFILE * file;
-        file = streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE);
-        if (!file) goto fail;
-        for (i=0;i<channel_count;i++) {
-            vgmstream->ch[i].streamfile = file;
-            vgmstream->ch[i].channel_start_offset=
-                vgmstream->ch[i].offset=start_offset+
-                vgmstream->interleave_block_size*i;
-        }
-    }
-
-    return vgmstream;
-
-    /* clean up anything we may have opened */
-fail:
-    if (vgmstream) close_vgmstream(vgmstream);
-    return NULL;
-}

src/meta/meta.h

@@ -263,8 +263,6 @@ VGMSTREAM * init_vgmstream_aix(STREAMFILE * streamFile);
 
 VGMSTREAM * init_vgmstream_ngc_tydsp(STREAMFILE * streamFile);
 
-VGMSTREAM * init_vgmstream_capdsp(STREAMFILE * streamFile);
-
 VGMSTREAM* init_vgmstream_wvs_xbox(STREAMFILE* sf);
 VGMSTREAM* init_vgmstream_wvs_ngc(STREAMFILE* sf);
 

src/vgmstream.c

@@ -106,7 +106,6 @@ VGMSTREAM* (*init_vgmstream_functions[])(STREAMFILE* sf) = {
     init_vgmstream_sdt,
     init_vgmstream_aix,
     init_vgmstream_ngc_tydsp,
-    init_vgmstream_capdsp,
     init_vgmstream_wvs_xbox,
     init_vgmstream_wvs_ngc,
     init_vgmstream_dc_str,

src/vgmstream.h

@@ -398,7 +398,6 @@ typedef enum {
     meta_PS2_ENTH,          /* Enthusia */
     meta_SDT,               /* Baldur's Gate - Dark Alliance */
     meta_NGC_TYDSP,         /* Ty - The Tasmanian Tiger */
-    meta_CAPDSP,            /* Capcom DSP Header [no header_id] */
     meta_DC_STR,            /* SEGA Stream Asset Builder */
     meta_DC_STR_V2,         /* variant of SEGA Stream Asset Builder */
     meta_NGC_BH2PCM,        /* Bio Hazard 2 */