diff --git a/src/formats.c b/src/formats.c index 950d4295..9e3e6bb0 100644 --- a/src/formats.c +++ b/src/formats.c @@ -23,7 +23,6 @@ static const char* extension_list[] = { "208", "2dx9", - "2pfs", "3do", "3ds", //txth/reserved [F1 2011 (3DS)] "4", //for Game.com audio @@ -1231,7 +1230,7 @@ static const meta_info meta_info_list[] = { {meta_MSS, "Guerilla MCSS header"}, {meta_PS2_HSF, "Lowrider 'HSF' header"}, {meta_IVAG, "Namco IVAG header"}, - {meta_PS2_2PFS, "Konami 2PFS header"}, + {meta_2PFS, "Konami 2PFS header"}, {meta_UBI_CKD, "Ubisoft CKD RIFF header"}, {meta_PS2_VBK, "PS2 VBK Header"}, {meta_OTM, "Otomedius OTM Header"}, diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj index 13a50931..788dfad9 100644 --- a/src/libvgmstream.vcxproj +++ b/src/libvgmstream.vcxproj @@ -335,6 +335,7 @@ + @@ -566,7 +567,6 @@ - diff --git a/src/libvgmstream.vcxproj.filters b/src/libvgmstream.vcxproj.filters index cab5add0..dfa914ad 100644 --- a/src/libvgmstream.vcxproj.filters +++ b/src/libvgmstream.vcxproj.filters @@ -826,6 +826,9 @@ meta\Source Files + + meta\Source Files + meta\Source Files @@ -1519,9 +1522,6 @@ meta\Source Files - - meta\Source Files - meta\Source Files diff --git a/src/meta/ps2_2pfs.c b/src/meta/2pfs.c similarity index 96% rename from src/meta/ps2_2pfs.c rename to src/meta/2pfs.c index 2e9ec30b..89be643a 100644 --- a/src/meta/ps2_2pfs.c +++ b/src/meta/2pfs.c @@ -3,7 +3,7 @@ /* 2PFS - from Konami Games [Mahoromatic: Moetto-KiraKira Maid-San (PS2), GANTZ The Game (PS2)] */ -VGMSTREAM* init_vgmstream_ps2_2pfs(STREAMFILE* sf) { +VGMSTREAM* init_vgmstream_2pfs(STREAMFILE* sf) { VGMSTREAM* vgmstream = NULL; off_t start_offset; int loop_flag, channels, version, interleave; @@ -42,7 +42,7 @@ VGMSTREAM* init_vgmstream_ps2_2pfs(STREAMFILE* sf) { vgmstream = allocate_vgmstream(channels, loop_flag); if (!vgmstream) goto fail; - vgmstream->meta_type = meta_PS2_2PFS; + vgmstream->meta_type = meta_2PFS; vgmstream->num_samples = read_u32le(0x34,sf) * 28 / 16 / channels; vgmstream->coding_type = coding_PSX; vgmstream->layout_type = layout_interleave; diff --git a/src/meta/meta.h b/src/meta/meta.h index de6b08bb..ba9f6725 100644 --- a/src/meta/meta.h +++ b/src/meta/meta.h @@ -523,7 +523,7 @@ VGMSTREAM * init_vgmstream_ps2_hsf(STREAMFILE* streamFile); VGMSTREAM * init_vgmstream_ivag(STREAMFILE* streamFile); -VGMSTREAM * init_vgmstream_ps2_2pfs(STREAMFILE* streamFile); +VGMSTREAM* init_vgmstream_2pfs(STREAMFILE* sf); VGMSTREAM * init_vgmstream_ubi_ckd(STREAMFILE* streamFile); diff --git a/src/vgmstream.c b/src/vgmstream.c index 3d479d0e..7cd72d75 100644 --- a/src/vgmstream.c +++ b/src/vgmstream.c @@ -245,7 +245,7 @@ init_vgmstream_t init_vgmstream_functions[] = { init_vgmstream_mss, init_vgmstream_ps2_hsf, init_vgmstream_ivag, - init_vgmstream_ps2_2pfs, + init_vgmstream_2pfs, init_vgmstream_xnb, init_vgmstream_ubi_ckd, init_vgmstream_ps2_vbk, diff --git a/src/vgmstream_types.h b/src/vgmstream_types.h index 754c9ac4..c4ae93de 100644 --- a/src/vgmstream_types.h +++ b/src/vgmstream_types.h @@ -508,7 +508,7 @@ typedef enum { meta_MSS, /* Guerilla: ShellShock Nam '67 (PS2/Xbox), Killzone (PS2) */ meta_PS2_HSF, /* Lowrider (PS2) */ meta_IVAG, - meta_PS2_2PFS, /* Konami: Mahoromatic: Moetto - KiraKira Maid-San, GANTZ (PS2) */ + meta_2PFS, meta_PS2_VBK, /* Disney's Stitch - Experiment 626 */ meta_OTM, /* Otomedius (Arcade) */ meta_CSTM, /* Nintendo 3DS CSTM (Century Stream) */