diff --git a/doc/FORMATS.md b/doc/FORMATS.md index 516c5648..55ab8083 100644 --- a/doc/FORMATS.md +++ b/doc/FORMATS.md @@ -420,10 +420,6 @@ different internally (encrypted, different versions, etc) and not always can be - CRI AIX header [*AIX*] - *aix*: `.aix` - Subfiles: *adx* -- **ngc_tydsp.c** - - .tydsp Header [*NGC_TYDSP*] - - *ngc_tydsp*: `.tydsp` - - Codecs: NGC_DSP - **wvs.c** - Swingin' Ape .WVS header [*WVS*] - *wvs_xbox*: `.wvs` diff --git a/src/formats.c b/src/formats.c index 93c31e10..85d69a1e 100644 --- a/src/formats.c +++ b/src/formats.c @@ -562,7 +562,6 @@ static const char* extension_list[] = { "tun", "txth", "txtp", - "tydsp", "u0", "ue4opus", @@ -1073,7 +1072,6 @@ static const meta_info meta_info_list[] = { {meta_PS2_VAS, "Konami .VAS header"}, {meta_LP_AP_LEP, "Konami LP/AP/LEP header"}, {meta_SDT, "High Voltage .sdt header"}, - {meta_NGC_TYDSP, ".tydsp Header"}, {meta_WVS, "Swingin' Ape .WVS header"}, {meta_DEC, "Falcom .DEC RIFF header"}, {meta_VS, "Melbourne House .VS header"}, diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj index 1171523c..bab32d8b 100644 --- a/src/libvgmstream.vcxproj +++ b/src/libvgmstream.vcxproj @@ -524,7 +524,6 @@ - diff --git a/src/libvgmstream.vcxproj.filters b/src/libvgmstream.vcxproj.filters index af34e784..afb0c61e 100644 --- a/src/libvgmstream.vcxproj.filters +++ b/src/libvgmstream.vcxproj.filters @@ -1393,9 +1393,6 @@ meta\Source Files - - meta\Source Files - meta\Source Files diff --git a/src/meta/meta.h b/src/meta/meta.h index 1bbc59e6..0808c20a 100644 --- a/src/meta/meta.h +++ b/src/meta/meta.h @@ -257,8 +257,6 @@ VGMSTREAM * init_vgmstream_sdt(STREAMFILE * streamFile); VGMSTREAM * init_vgmstream_aix(STREAMFILE * streamFile); -VGMSTREAM * init_vgmstream_ngc_tydsp(STREAMFILE * streamFile); - VGMSTREAM* init_vgmstream_wvs_xbox(STREAMFILE* sf); VGMSTREAM* init_vgmstream_wvs_ngc(STREAMFILE* sf); diff --git a/src/meta/mus_krone.c b/src/meta/mus_krone.c index de14948e..7b75522a 100644 --- a/src/meta/mus_krone.c +++ b/src/meta/mus_krone.c @@ -3,7 +3,7 @@ #include "../coding/coding.h" -/* .mus - from Star Wars: The Force Unleashed (Wii) */ +/* .mus - from Krone games [Ty: The Tasmanian Tiger 2 (GC), Star Wars: The Force Unleashed (Wii)] */ VGMSTREAM* init_vgmstream_mus_krone(STREAMFILE* sf) { VGMSTREAM* vgmstream = NULL; uint32_t start_offset, data_size; diff --git a/src/meta/ngc_tydsp.c b/src/meta/ngc_tydsp.c deleted file mode 100644 index 37f3a603..00000000 --- a/src/meta/ngc_tydsp.c +++ /dev/null @@ -1,72 +0,0 @@ -#include "meta.h" -#include "../util.h" - -/* TYDSP (Ty - The Tasmanian Tiger) */ -VGMSTREAM * init_vgmstream_ngc_tydsp(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("tydsp",filename_extension(filename))) goto fail; - - loop_flag = 1; - channel_count = 2; - - /* build the VGMSTREAM */ - vgmstream = allocate_vgmstream(channel_count,loop_flag); - if (!vgmstream) goto fail; - - /* fill in the vital statistics */ - start_offset = read_32bitBE(0x08,streamFile); - vgmstream->channels = channel_count; - vgmstream->sample_rate = (uint16_t)(read_16bitBE(0x6C,streamFile)); - vgmstream->coding_type = coding_NGC_DSP; - vgmstream->num_samples = read_32bitBE(0x00,streamFile); - if (loop_flag) { - vgmstream->loop_start_sample = 0; - vgmstream->loop_end_sample = read_32bitBE(0x00,streamFile); - } - - vgmstream->layout_type = layout_interleave; - vgmstream->interleave_block_size = read_32bitBE(0x04,streamFile); - vgmstream->meta_type = meta_NGC_TYDSP; - - if (vgmstream->coding_type == coding_NGC_DSP) { - int i; - for (i=0;i<16;i++) { - vgmstream->ch[0].adpcm_coef[i] = read_16bitBE(0x10+i*2,streamFile); - } - if (vgmstream->channels) { - for (i=0;i<16;i++) { - vgmstream->ch[1].adpcm_coef[i] = read_16bitBE(0x3E +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;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 63d2e822..de7a7e63 100644 --- a/src/vgmstream.c +++ b/src/vgmstream.c @@ -103,7 +103,6 @@ init_vgmstream_t init_vgmstream_functions[] = { init_vgmstream_lp_ap_lep, init_vgmstream_sdt, init_vgmstream_aix, - init_vgmstream_ngc_tydsp, init_vgmstream_wvs_xbox, init_vgmstream_wvs_ngc, init_vgmstream_dc_str, diff --git a/src/vgmstream_types.h b/src/vgmstream_types.h index ca0f70f8..27784640 100644 --- a/src/vgmstream_types.h +++ b/src/vgmstream_types.h @@ -344,7 +344,6 @@ typedef enum { meta_PS2_VAS, /* Pro Baseball Spirits 5 */ meta_LP_AP_LEP, meta_SDT, /* Baldur's Gate - Dark Alliance */ - meta_NGC_TYDSP, /* Ty - The Tasmanian Tiger */ meta_DC_STR, /* SEGA Stream Asset Builder */ meta_DC_STR_V2, /* variant of SEGA Stream Asset Builder */ meta_SAP,