Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-02-17 19:19:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove fake .2pfs extension (use .sap)

Browse Source 
also rename ps2_2pfs to 2pfs, though .c files shouldn't start with a number, but we have precedents
This commit is contained in:
bnnm 2024-01-18 22:20:58 +01:00
parent d24e194f13
commit 366c1318e1
7 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/formats.c
View File

@ -23,7 +23,6 @@ static const char* extension_list[] = {
"208", "208",
"2dx9", "2dx9",
"2pfs",
"3do", "3do",
"3ds", //txth/reserved [F1 2011 (3DS)] "3ds", //txth/reserved [F1 2011 (3DS)]
"4", //for Game.com audio "4", //for Game.com audio
@ -1231,7 +1230,7 @@ static const meta_info meta_info_list[] = {
{meta_MSS, "Guerilla MCSS header"}, {meta_MSS, "Guerilla MCSS header"},
{meta_PS2_HSF, "Lowrider 'HSF' header"}, {meta_PS2_HSF, "Lowrider 'HSF' header"},
{meta_IVAG, "Namco IVAG 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_UBI_CKD, "Ubisoft CKD RIFF header"},
{meta_PS2_VBK, "PS2 VBK Header"}, {meta_PS2_VBK, "PS2 VBK Header"},
{meta_OTM, "Otomedius OTM Header"}, {meta_OTM, "Otomedius OTM Header"},

2
src/libvgmstream.vcxproj
View File

@ -335,6 +335,7 @@
<ClCompile Include="layout\segmented.c" /> <ClCompile Include="layout\segmented.c" />
<ClCompile Include="meta\208.c" /> <ClCompile Include="meta\208.c" />
<ClCompile Include="meta\2dx9.c" /> <ClCompile Include="meta\2dx9.c" />
<ClCompile Include="meta\2pfs.c" />
<ClCompile Include="meta\9tav.c" /> <ClCompile Include="meta\9tav.c" />
<ClCompile Include="meta\a2m.c" /> <ClCompile Include="meta\a2m.c" />
<ClCompile Include="meta\aac_triace.c" /> <ClCompile Include="meta\aac_triace.c" />
@ -566,7 +567,6 @@
<ClCompile Include="meta\pona.c" /> <ClCompile Include="meta\pona.c" />
<ClCompile Include="meta\pos.c" /> <ClCompile Include="meta\pos.c" />
<ClCompile Include="meta\ppst.c" /> <ClCompile Include="meta\ppst.c" />
<ClCompile Include="meta\ps2_2pfs.c" />
<ClCompile Include="meta\ps2_adm.c" /> <ClCompile Include="meta\ps2_adm.c" />
<ClCompile Include="meta\ps2_ass.c" /> <ClCompile Include="meta\ps2_ass.c" />
<ClCompile Include="meta\ps2_b1s.c" /> <ClCompile Include="meta\ps2_b1s.c" />

6
src/libvgmstream.vcxproj.filters
View File

@ -826,6 +826,9 @@
<ClCompile Include="meta\2dx9.c"> <ClCompile Include="meta\2dx9.c">
<Filter>meta\Source Files</Filter> <Filter>meta\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="meta\2pfs.c">
<Filter>meta\Source Files</Filter>
</ClCompile>
<ClCompile Include="meta\9tav.c"> <ClCompile Include="meta\9tav.c">
<Filter>meta\Source Files</Filter> <Filter>meta\Source Files</Filter>
</ClCompile> </ClCompile>
@ -1519,9 +1522,6 @@
<ClCompile Include="meta\ppst.c"> <ClCompile Include="meta\ppst.c">
<Filter>meta\Source Files</Filter> <Filter>meta\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="meta\ps2_2pfs.c">
<Filter>meta\Source Files</Filter>
</ClCompile>
<ClCompile Include="meta\ps2_adm.c"> <ClCompile Include="meta\ps2_adm.c">
<Filter>meta\Source Files</Filter> <Filter>meta\Source Files</Filter>
</ClCompile> </ClCompile>

4
src/meta/ps2_2pfs.c → src/meta/2pfs.c
View File

@ -3,7 +3,7 @@
/* 2PFS - from Konami Games [Mahoromatic: Moetto-KiraKira Maid-San (PS2), GANTZ The Game (PS2)] */ /* 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; VGMSTREAM* vgmstream = NULL;
off_t start_offset; off_t start_offset;
int loop_flag, channels, version, interleave; int loop_flag, channels, version, interleave;
@ -42,7 +42,7 @@ VGMSTREAM* init_vgmstream_ps2_2pfs(STREAMFILE* sf) {
vgmstream = allocate_vgmstream(channels, loop_flag); vgmstream = allocate_vgmstream(channels, loop_flag);
if (!vgmstream) goto fail; 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->num_samples = read_u32le(0x34,sf) * 28 / 16 / channels;
vgmstream->coding_type = coding_PSX; vgmstream->coding_type = coding_PSX;
vgmstream->layout_type = layout_interleave; vgmstream->layout_type = layout_interleave;

2
src/meta/meta.h
View File

@ -523,7 +523,7 @@ VGMSTREAM * init_vgmstream_ps2_hsf(STREAMFILE* streamFile);
VGMSTREAM * init_vgmstream_ivag(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); VGMSTREAM * init_vgmstream_ubi_ckd(STREAMFILE* streamFile);

2
src/vgmstream.c
View File

@ -245,7 +245,7 @@ init_vgmstream_t init_vgmstream_functions[] = {
init_vgmstream_mss, init_vgmstream_mss,
init_vgmstream_ps2_hsf, init_vgmstream_ps2_hsf,
init_vgmstream_ivag, init_vgmstream_ivag,
init_vgmstream_ps2_2pfs, init_vgmstream_2pfs,
init_vgmstream_xnb, init_vgmstream_xnb,
init_vgmstream_ubi_ckd, init_vgmstream_ubi_ckd,
init_vgmstream_ps2_vbk, init_vgmstream_ps2_vbk,

2
src/vgmstream_types.h
View File

@ -508,7 +508,7 @@ typedef enum {
meta_MSS, /* Guerilla: ShellShock Nam '67 (PS2/Xbox), Killzone (PS2) */ meta_MSS, /* Guerilla: ShellShock Nam '67 (PS2/Xbox), Killzone (PS2) */
meta_PS2_HSF, /* Lowrider (PS2) */ meta_PS2_HSF, /* Lowrider (PS2) */
meta_IVAG, meta_IVAG,
meta_PS2_2PFS, /* Konami: Mahoromatic: Moetto - KiraKira Maid-San, GANTZ (PS2) */ meta_2PFS,
meta_PS2_VBK, /* Disney's Stitch - Experiment 626 */ meta_PS2_VBK, /* Disney's Stitch - Experiment 626 */
meta_OTM, /* Otomedius (Arcade) */ meta_OTM, /* Otomedius (Arcade) */
meta_CSTM, /* Nintendo 3DS CSTM (Century Stream) */ meta_CSTM, /* Nintendo 3DS CSTM (Century Stream) */