diff --git a/src/formats.c b/src/formats.c index 68fa8702..3c03e690 100644 --- a/src/formats.c +++ b/src/formats.c @@ -100,7 +100,6 @@ static const char* extension_list[] = { "bcwav", "bcv", //txth/reserved [The Bigs (PSP)] "bd3", - "bdsp", "bfstm", "bfwav", "bg00", @@ -942,7 +941,6 @@ static const layout_info layout_info_list[] = { {layout_blocked_filp, "blocked (FILP)"}, {layout_blocked_ea_swvr, "blocked (EA SWVR)"}, {layout_blocked_adm, "blocked (ADM)"}, - {layout_blocked_bdsp, "blocked (BDSP)"}, {layout_blocked_ivaud, "blocked (IVAUD)"}, {layout_blocked_ps2_iab, "blocked (IAB)"}, {layout_blocked_vs_str, "blocked (STR VS)"}, diff --git a/src/layout/blocked.c b/src/layout/blocked.c index d38a2053..bb7f6564 100644 --- a/src/layout/blocked.c +++ b/src/layout/blocked.c @@ -156,9 +156,6 @@ void block_update(off_t block_offset, VGMSTREAM* vgmstream) { case layout_blocked_adm: block_update_adm(block_offset,vgmstream); break; - case layout_blocked_bdsp: - block_update_bdsp(block_offset,vgmstream); - break; case layout_blocked_ps2_iab: block_update_ps2_iab(block_offset,vgmstream); break; diff --git a/src/layout/blocked_bdsp.c b/src/layout/blocked_bdsp.c deleted file mode 100644 index f5e763ab..00000000 --- a/src/layout/blocked_bdsp.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "layout.h" -#include "../vgmstream.h" - -/* set up for the block at the given offset */ -void block_update_bdsp(off_t block_offset, VGMSTREAM * vgmstream) { - int i; - - vgmstream->current_block_offset = block_offset; - vgmstream->current_block_size = read_32bitBE(vgmstream->current_block_offset,vgmstream->ch[0].streamfile)/7*8; - vgmstream->next_block_offset = vgmstream->current_block_offset + vgmstream->current_block_size+0xC0; - - for (i=0;ichannels;i++) { - - vgmstream->ch[i].channel_start_offset= - vgmstream->ch[i].offset=vgmstream->current_block_offset*i; - - } -} diff --git a/src/layout/layout.h b/src/layout/layout.h index 1eeda70b..4f3e64d6 100644 --- a/src/layout/layout.h +++ b/src/layout/layout.h @@ -31,7 +31,6 @@ void block_update_filp(off_t block_offset, VGMSTREAM* vgmstream); void block_update_ivaud(off_t block_offset, VGMSTREAM* vgmstream); void block_update_ea_swvr(off_t block_offset, VGMSTREAM* vgmstream); void block_update_adm(off_t block_offset, VGMSTREAM* vgmstream); -void block_update_bdsp(off_t block_offset, VGMSTREAM* vgmstream); void block_update_ps2_iab(off_t block_offset, VGMSTREAM* vgmstream); void block_update_vs_str(off_t block_offset, VGMSTREAM* vgmstream); void block_update_rws(off_t block_offset, VGMSTREAM* vgmstream); diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj index 8c9c43ec..55e96304 100644 --- a/src/libvgmstream.vcxproj +++ b/src/libvgmstream.vcxproj @@ -283,7 +283,6 @@ - @@ -404,7 +403,6 @@ - diff --git a/src/libvgmstream.vcxproj.filters b/src/libvgmstream.vcxproj.filters index 302202fb..6c8724ec 100644 --- a/src/libvgmstream.vcxproj.filters +++ b/src/libvgmstream.vcxproj.filters @@ -670,9 +670,6 @@ layout\Source Files - - layout\Source Files - layout\Source Files @@ -1033,9 +1030,6 @@ meta\Source Files - - meta\Source Files - meta\Source Files diff --git a/src/meta/dsp_bdsp.c b/src/meta/dsp_bdsp.c deleted file mode 100644 index a72dd782..00000000 --- a/src/meta/dsp_bdsp.c +++ /dev/null @@ -1,87 +0,0 @@ -#include "meta.h" -#include "../layout/layout.h" -#include "../util.h" - -VGMSTREAM * init_vgmstream_dsp_bdsp(STREAMFILE *streamFile) { - - VGMSTREAM * vgmstream = NULL; - char filename[PATH_LIMIT]; - int channel_count; - int loop_flag; - int i; - off_t start_offset; - - /* check extension, case insensitive */ - streamFile->get_name(streamFile,filename,sizeof(filename)); - if (strcasecmp("bdsp",filename_extension(filename))) goto fail; - - channel_count = 2; - loop_flag = 0; - - /* build the VGMSTREAM */ - vgmstream = allocate_vgmstream(channel_count,loop_flag); - if (!vgmstream) goto fail; - - /* fill in the vital statistics */ - vgmstream->channels = channel_count; - vgmstream->sample_rate = read_32bitBE(0x8,streamFile); - vgmstream->coding_type = coding_NGC_DSP; - -#if 0 - if(loop_flag) { - vgmstream->loop_start_sample = read_32bitBE(0x64,streamFile); - vgmstream->loop_end_sample = read_32bitBE(0x68,streamFile); - } -#endif - - - vgmstream->layout_type = layout_blocked_bdsp; - vgmstream->interleave_block_size = 0x8; - vgmstream->meta_type = meta_DSP_BDSP; - - /* open the file for reading by each channel */ - { - for (i=0;ich[i].streamfile = streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE); - - if (!vgmstream->ch[i].streamfile) goto fail; - vgmstream->ch[i].channel_start_offset= - vgmstream->ch[i].offset=i*vgmstream->interleave_block_size; - } - } - - if (vgmstream->coding_type == coding_NGC_DSP) { - int i; - for (i=0;i<16;i++) { - vgmstream->ch[0].adpcm_coef[i] = read_16bitBE(0x1C+i*2,streamFile); - } - if (vgmstream->channels == 2) { - for (i=0;i<16;i++) { - vgmstream->ch[1].adpcm_coef[i] = read_16bitBE(0x7C+i*2,streamFile); - } - } - } - - /* Calc num_samples */ - start_offset = 0x0; - block_update_bdsp(start_offset,vgmstream); - vgmstream->num_samples=0; - - do - { - vgmstream->num_samples += vgmstream->current_block_size*14/8; - block_update_bdsp(vgmstream->next_block_offset,vgmstream); - } - while (vgmstream->next_block_offset