From d56bca12f8fc46703482626400f76c2ba9836a8f Mon Sep 17 00:00:00 2001 From: bnnm Date: Sat, 12 Jan 2019 02:55:24 +0100 Subject: [PATCH] Remove ps2_khv.c as it's now parsed in vag.c --- src/formats.c | 2 +- src/libvgmstream.vcproj | 4 -- src/libvgmstream.vcxproj | 1 - src/libvgmstream.vcxproj.filters | 3 -- src/meta/meta.h | 2 - src/meta/ps2_khv.c | 65 -------------------------------- src/vgmstream.c | 1 - src/vgmstream.h | 1 - 8 files changed, 1 insertion(+), 78 deletions(-) delete mode 100644 src/meta/ps2_khv.c diff --git a/src/formats.c b/src/formats.c index e7bc4fad..1b7da6fb 100644 --- a/src/formats.c +++ b/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", diff --git a/src/libvgmstream.vcproj b/src/libvgmstream.vcproj index ffe1b420..59b9fee0 100644 --- a/src/libvgmstream.vcproj +++ b/src/libvgmstream.vcproj @@ -1062,10 +1062,6 @@ RelativePath=".\meta\ps2_kces.c" > - - diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj index 2d10d5fb..22ef947a 100644 --- a/src/libvgmstream.vcxproj +++ b/src/libvgmstream.vcxproj @@ -367,7 +367,6 @@ - diff --git a/src/libvgmstream.vcxproj.filters b/src/libvgmstream.vcxproj.filters index b27f6056..d0b18ddb 100644 --- a/src/libvgmstream.vcxproj.filters +++ b/src/libvgmstream.vcxproj.filters @@ -658,9 +658,6 @@ meta\Source Files - - meta\Source Files - meta\Source Files diff --git a/src/meta/meta.h b/src/meta/meta.h index 869977c0..216c172e 100644 --- a/src/meta/meta.h +++ b/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); diff --git a/src/meta/ps2_khv.c b/src/meta/ps2_khv.c deleted file mode 100644 index e700025f..00000000 --- a/src/meta/ps2_khv.c +++ /dev/null @@ -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;ich[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; -} diff --git a/src/vgmstream.c b/src/vgmstream.c index 9d586628..d6c85dd5 100644 --- a/src/vgmstream.c +++ b/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, diff --git a/src/vgmstream.h b/src/vgmstream.h index 771b015b..aed5ddc3 100644 --- a/src/vgmstream.h +++ b/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) */