Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-01-18 15:54:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename vawx to xwav

Browse Source
This commit is contained in:
bnnm 2020-10-01 22:02:54 +02:00
parent 96727a5192
commit 3097ca83dc
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/formats.c
View File

@ -858,7 +858,7 @@ static const layout_info layout_info_list[] = {
{layout_blocked_ea_sns, "blocked (EA SNS)"},
{layout_blocked_awc, "blocked (AWC)"},
{layout_blocked_vgs, "blocked (VGS)"},
{layout_blocked_vawx, "blocked (VAWX)"},
{layout_blocked_xwav, "blocked (XWAV)"},
{layout_blocked_xvag_subsong, "blocked (XVAG subsong)"},
{layout_blocked_ea_wve_au00, "blocked (EA WVE au00)"},
{layout_blocked_ea_wve_ad10, "blocked (EA WVE Ad10)"},

4
src/layout/blocked.c
View File

@ -182,8 +182,8 @@ void block_update(off_t block_offset, VGMSTREAM * vgmstream) {
case layout_blocked_vgs:
block_update_vgs(block_offset,vgmstream);
break;
case layout_blocked_vawx:
block_update_vawx(block_offset,vgmstream);
case layout_blocked_xwav:
block_update_xwav(block_offset,vgmstream);
break;
case layout_blocked_xvag_subsong:
block_update_xvag_subsong(block_offset,vgmstream);

2
src/layout/blocked_vawx.c → src/layout/blocked_xwav.c
View File

@ -2,7 +2,7 @@
#include "../vgmstream.h"
/* pseudo-blocks that must skip last 0x20 every 0x8000 */
void block_update_vawx(off_t block_offset, VGMSTREAM * vgmstream) {
void block_update_xwav(off_t block_offset, VGMSTREAM * vgmstream) {
int i;
size_t block_size;

2
src/layout/layout.h
View File

@ -38,7 +38,7 @@ void block_update_hwas(off_t block_offset, VGMSTREAM* vgmstream);
void block_update_ea_sns(off_t block_offset, VGMSTREAM* vgmstream);
void block_update_awc(off_t block_offset, VGMSTREAM* vgmstream);
void block_update_vgs(off_t block_offset, VGMSTREAM* vgmstream);
void block_update_vawx(off_t block_offset, VGMSTREAM* vgmstream);
void block_update_xwav(off_t block_offset, VGMSTREAM* vgmstream);
void block_update_xvag_subsong(off_t block_offset, VGMSTREAM* vgmstream);
void block_update_ea_wve_au00(off_t block_offset, VGMSTREAM* vgmstream);
void block_update_ea_wve_ad10(off_t block_offset, VGMSTREAM* vgmstream);

4
src/libvgmstream.vcproj
View File

@ -1523,7 +1523,7 @@
>
</File>
<File
RelativePath=".\meta\vawx.c"
RelativePath=".\meta\xwav.c"
>
</File>
<File
@ -2367,7 +2367,7 @@
>
</File>
<File
RelativePath=".\layout\blocked_vawx.c"
RelativePath=".\layout\blocked_xwav.c"
>
</File>
<File

4
src/libvgmstream.vcxproj
View File

@ -235,7 +235,7 @@
<ClCompile Include="meta\sgxd.c" />
<ClCompile Include="meta\silence.c" />
<ClCompile Include="meta\sk_aud.c" />
<ClCompile Include="meta\vawx.c" />
<ClCompile Include="meta\xwav.c" />
<ClCompile Include="meta\seg.c" />
<ClCompile Include="meta\sfh.c" />
<ClCompile Include="meta\sqex_scd.c" />
@ -644,7 +644,7 @@
<ClCompile Include="layout\blocked_vgs.c" />
<ClCompile Include="layout\blocked_vid1.c" />
<ClCompile Include="layout\blocked_vs_square.c" />
<ClCompile Include="layout\blocked_vawx.c" />
<ClCompile Include="layout\blocked_xwav.c" />
<ClCompile Include="layout\blocked_xvag.c" />
<ClCompile Include="layout\blocked_caf.c" />
<ClCompile Include="layout\blocked_dec.c" />

4
src/libvgmstream.vcxproj.filters
View File

@ -1420,7 +1420,7 @@
<ClCompile Include="layout\blocked_vs_square.c">
<Filter>layout\Source Files</Filter>
</ClCompile>
<ClCompile Include="layout\blocked_vawx.c">
<ClCompile Include="layout\blocked_xwav.c">
<Filter>layout\Source Files</Filter>
</ClCompile>
<ClCompile Include="layout\blocked_xvag.c">
@ -1561,7 +1561,7 @@
<ClCompile Include="meta\lsf.c">
<Filter>meta\Source Files</Filter>
</ClCompile>
<ClCompile Include="meta\vawx.c">
<ClCompile Include="meta\xwav.c">
<Filter>meta\Source Files</Filter>
</ClCompile>
<ClCompile Include="meta\raw_snds.c">

2
src/meta/vawx.c → src/meta/xwav.c
View File

@ -61,7 +61,7 @@ VGMSTREAM* init_vgmstream_xwav_new(STREAMFILE* sf) {
switch(codec) {
case 2: /* No Nore Heroes (PS3) */
vgmstream->coding_type = coding_PSX;
vgmstream->layout_type = channels == 6 ? layout_blocked_vawx : layout_interleave;
vgmstream->layout_type = channels == 6 ? layout_blocked_xwav : layout_interleave;
vgmstream->interleave_block_size = 0x10;
vgmstream->loop_start_sample = loop_start;

2
src/render.c
View File

@ -294,7 +294,7 @@ static int render_layout(sample_t* buf, int32_t sample_count, VGMSTREAM* vgmstre
case layout_blocked_ea_sns:
case layout_blocked_awc:
case layout_blocked_vgs:
case layout_blocked_vawx:
case layout_blocked_xwav:
case layout_blocked_xvag_subsong:
case layout_blocked_ea_wve_au00:
case layout_blocked_ea_wve_ad10:

2
src/vgmstream.h
View File

@ -271,7 +271,7 @@ typedef enum {
layout_blocked_ea_sns, /* newest Electronic Arts blocks, found in SNS/SNU/SPS/etc formats */
layout_blocked_awc, /* Rockstar AWC */
layout_blocked_vgs, /* Guitar Hero II (PS2) */
layout_blocked_vawx, /* No More Heroes 6ch (PS3) */
layout_blocked_xwav,
layout_blocked_xvag_subsong, /* XVAG subsongs [God of War III (PS4)] */
layout_blocked_ea_wve_au00, /* EA WVE au00 blocks */
layout_blocked_ea_wve_ad10, /* EA WVE Ad10 blocks */