Remove ps2_khv.c as it's now parsed in vag.c

src/formats.c

@@ -195,7 +195,7 @@ static const char* extension_list[] = {
 
     "kces",
     "kcey", //fake extension/header id for .pcm (renamed, to be removed)
-    "khv",
+    "khv", //fake extension/header id for .vas (renamed, to be removed)
     "km9",
     "kovs", //fake extension/header id for .kvs
     "kns",

src/libvgmstream.vcproj

@@ -1062,10 +1062,6 @@
 					RelativePath=".\meta\ps2_kces.c"
 					>
 				</File>
-				<File
-					RelativePath=".\meta\ps2_khv.c"
-					>
-				</File>
 				<File
 					RelativePath=".\meta\ps2_leg.c"
 					>

src/libvgmstream.vcxproj

@@ -367,7 +367,6 @@
     <ClCompile Include="meta\ps2_joe.c" />
     <ClCompile Include="meta\ps2_jstm.c" />
     <ClCompile Include="meta\ps2_kces.c" />
-    <ClCompile Include="meta\ps2_khv.c" />
     <ClCompile Include="meta\ps2_leg.c" />
     <ClCompile Include="meta\ps2_lpcm.c" />
     <ClCompile Include="meta\ps2_mcg.c" />

src/libvgmstream.vcxproj.filters

@@ -658,9 +658,6 @@
     <ClCompile Include="meta\ps2_kces.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta\ps2_khv.c">
-      <Filter>meta\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="meta\ps2_leg.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>

src/meta/meta.h

@@ -472,8 +472,6 @@ VGMSTREAM * init_vgmstream_ps2_msa(STREAMFILE* streamFile);
 
 VGMSTREAM * init_vgmstream_ps2_voi(STREAMFILE* streamFile);
 
-VGMSTREAM * init_vgmstream_ps2_khv(STREAMFILE* streamFile);
-
 VGMSTREAM * init_vgmstream_ngc_rkv(STREAMFILE* streamFile);
 
 VGMSTREAM * init_vgmstream_p3d(STREAMFILE* streamFile);

src/meta/ps2_khv.c

@@ -1,65 +0,0 @@
-#include "meta.h"
-#include "../util.h"
-
-/* KHV (from Kingdom Hearts 2) */
-/* VAG files with custom headers */
-VGMSTREAM * init_vgmstream_ps2_khv(STREAMFILE *streamFile) {
-    VGMSTREAM * vgmstream = NULL;
-    char filename[PATH_LIMIT];
-    int loop_flag = 0;
-		int channel_count;
-    off_t start_offset;
-    
-    /* check extension, case insensitive */
-    streamFile->get_name(streamFile,filename,sizeof(filename));
-    if (strcasecmp("khv",filename_extension(filename))) goto fail;
-
-    /* check header */
-    if (read_32bitBE(0x00,streamFile) != 0x56414770) /* "VAGp" */
-        goto fail;
-
-    loop_flag = (read_32bitBE(0x14,streamFile)!=0);
-    channel_count = 2;
-    
-		/* build the VGMSTREAM */
-    vgmstream = allocate_vgmstream(channel_count,loop_flag);
-    if (!vgmstream) goto fail;
-
-		/* fill in the vital statistics */
-    start_offset = 0x60;
-		vgmstream->channels = channel_count;
-    vgmstream->sample_rate = read_32bitBE(0x10,streamFile);
-    vgmstream->coding_type = coding_PSX;
-    vgmstream->num_samples = read_32bitBE(0x0C,streamFile);
-    if (loop_flag) {
-        vgmstream->loop_start_sample = read_32bitBE(0x14,streamFile);
-        vgmstream->loop_end_sample = read_32bitBE(0x18,streamFile);
-    }
-
-    vgmstream->layout_type = layout_interleave;
-    vgmstream->interleave_block_size = 0x10;
-    vgmstream->meta_type = meta_PS2_KHV;
-
-    /* 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

@@ -253,7 +253,6 @@ VGMSTREAM * (*init_vgmstream_functions[])(STREAMFILE *streamFile) = {
     init_vgmstream_ps2_smpl,
     init_vgmstream_ps2_msa,
     init_vgmstream_ps2_voi,
-    init_vgmstream_ps2_khv,
     init_vgmstream_ngc_rkv,
     init_vgmstream_dsp_ddsp,
     init_vgmstream_p3d,

src/vgmstream.h

@@ -533,7 +533,6 @@ typedef enum {
     meta_PS2_SMPL,          /* Homura */
     meta_PS2_MSA,           /* Psyvariar -Complete Edition- */
     meta_PS2_VOI,           /* RAW Danger (Zettaizetsumei Toshi 2 - Itetsuita Kiokutachi) [PS2] */
-    meta_PS2_KHV,           /* Kingdom Hearts 2 VAG streams */
     meta_P3D,               /* Prototype P3D */
     meta_PS2_TK1,           /* Tekken (NamCollection) */
     meta_NGC_RKV,           /* Legacy of Kain - Blood Omen 2 (GC) */