Remove buggy ngca.c meta (now part of musx.c)

src/formats.c

@@ -353,7 +353,6 @@ static const char* extension_list[] = {
     "naac",
     "nds",
     "ndp", //fake extension/header id for .nds
-    "ngca",
     "nlsd",
     "nop",
     "nps",
@@ -1151,7 +1150,6 @@ static const meta_info meta_info_list[] = {
         {meta_MSF,                  "Sony MSF header"},
         {meta_PS3_PAST,             "SNDP header"},
         {meta_SGXD,                 "Sony SGXD header"},
-        {meta_NGCA,                 "NGCA header"},
         {meta_WII_RAS,              "RAS header"},
         {meta_PS2_SPM,              "SPM header"},
         {meta_X360_TRA,             "Terminal Reality .TRA raw header"},

src/libvgmstream.vcproj

@@ -1106,10 +1106,6 @@
                     RelativePath=".\meta\vid1.c"
                     >
                 </File>
-				<File
-					RelativePath=".\meta\ngca.c"
-					>
-				</File>
                 <File
                     RelativePath=".\meta\opus.c"
                     >

src/libvgmstream.vcxproj

@@ -222,7 +222,6 @@
     <ClCompile Include="meta\msf_banpresto.c" />
     <ClCompile Include="meta\msf_konami.c" />
     <ClCompile Include="meta\msf_tamasoft.c" />
-    <ClCompile Include="meta\ngca.c" />
     <ClCompile Include="meta\opus.c" />
     <ClCompile Include="meta\pc_adp.c" />
     <ClCompile Include="meta\pc_adp_otns.c" />

src/libvgmstream.vcxproj.filters

@@ -1579,9 +1579,6 @@
     <ClCompile Include="meta\silence.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta\ngca.c">
-      <Filter>meta\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="meta\opus.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>

src/meta/meta.h

@@ -508,8 +508,6 @@ VGMSTREAM * init_vgmstream_ps3_past(STREAMFILE* streamFile);
 
 VGMSTREAM * init_vgmstream_sgxd(STREAMFILE* streamFile);
 
-VGMSTREAM * init_vgmstream_ngca(STREAMFILE* streamFile);
-
 VGMSTREAM * init_vgmstream_wii_ras(STREAMFILE* streamFile);
 
 VGMSTREAM * init_vgmstream_ps2_spm(STREAMFILE* streamFile);

src/meta/ngca.c

@@ -1,68 +0,0 @@
-#include "meta.h"
-#include "../util.h"
-
-/* NGCA (from GoldenEye 007) */
-VGMSTREAM * init_vgmstream_ngca(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("ngca",filename_extension(filename))) goto fail;
-
-    /* check header */
-    if (read_32bitBE(0x00,streamFile) != 0x4E474341) /* "NGCA" */
-        goto fail;
-
-    loop_flag = 0;
-    channel_count = 1;
-
-   /* build the VGMSTREAM */
-    vgmstream = allocate_vgmstream(channel_count,loop_flag);
-    if (!vgmstream) goto fail;
-
-   /* fill in the vital statistics */
-    start_offset = 0x40;
-    vgmstream->channels = channel_count;
-    vgmstream->sample_rate = 32000;
-    vgmstream->coding_type = coding_NGC_DSP;
-    vgmstream->num_samples = (((read_32bitBE(0x4,streamFile))/2) - 1) / 8 * 14;
-
-    vgmstream->layout_type = layout_none;
-    vgmstream->meta_type = meta_NGCA;
-    vgmstream->allow_dual_stereo = 1;
-
-	 if (vgmstream->coding_type == coding_NGC_DSP) {
-         int i;
-         for (i=0;i<16;i++) {
-            vgmstream->ch[0].adpcm_coef[i] = read_16bitBE(0xC+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/vgmstream.c

@@ -264,7 +264,6 @@ VGMSTREAM* (*init_vgmstream_functions[])(STREAMFILE* sf) = {
     init_vgmstream_msf,
     init_vgmstream_ps3_past,
     init_vgmstream_sgxd,
-    init_vgmstream_ngca,
     init_vgmstream_wii_ras,
     init_vgmstream_ps2_spm,
     init_vgmstream_x360_tra,

src/vgmstream.h

@@ -563,7 +563,6 @@ typedef enum {
     meta_MSF,
     meta_PS3_PAST,          /* Bakugan Battle Brawlers (PS3) */
     meta_SGXD,              /* Sony: Folklore, Genji, Tokyo Jungle (PS3), Brave Story, Kurohyo (PSP) */
-    meta_NGCA,              /* GoldenEye 007 (Wii) */
     meta_WII_RAS,           /* Donkey Kong Country Returns (Wii) */
     meta_PS2_SPM,           /* Lethal Skies Elite Pilot: Team SW */
     meta_X360_TRA,          /* Def Jam Rapstar */