Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-12-01 09:37:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean .vs naming

Browse Source
This commit is contained in:
bnnm 2018-12-22 20:09:01 +01:00
parent a1d559d529
commit c74da3884d
10 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/formats.c
View File

@ -673,7 +673,7 @@ static const layout_info layout_info_list[] = {
{layout_blocked_ws_aud, "blocked (Westwood Studios .aud)"}, {layout_blocked_ws_aud, "blocked (Westwood Studios .aud)"},
{layout_blocked_matx, "blocked (Matrix .matx)"}, {layout_blocked_matx, "blocked (Matrix .matx)"},
{layout_blocked_dec, "blocked (DEC)"}, {layout_blocked_dec, "blocked (DEC)"},
{layout_blocked_vs, "blocked (VS)"}, {layout_blocked_vs, "blocked (Melbourne House VS)"},
{layout_blocked_mul, "blocked (MUL)"}, {layout_blocked_mul, "blocked (MUL)"},
{layout_blocked_gsb, "blocked (GSB)"}, {layout_blocked_gsb, "blocked (GSB)"},
{layout_blocked_thp, "blocked (THP Movie Audio)"}, {layout_blocked_thp, "blocked (THP Movie Audio)"},
@ -683,7 +683,7 @@ static const layout_info layout_info_list[] = {
{layout_blocked_bdsp, "blocked (BDSP)"}, {layout_blocked_bdsp, "blocked (BDSP)"},
{layout_blocked_ivaud, "blocked (IVAUD)"}, {layout_blocked_ivaud, "blocked (IVAUD)"},
{layout_blocked_ps2_iab, "blocked (IAB)"}, {layout_blocked_ps2_iab, "blocked (IAB)"},
{layout_blocked_ps2_strlr, "blocked (The Bouncer STR)"}, {layout_blocked_vs_str, "blocked (STR VS)"},
{layout_blocked_rws, "blocked (RWS)"}, {layout_blocked_rws, "blocked (RWS)"},
{layout_blocked_hwas, "blocked (HWAS)"}, {layout_blocked_hwas, "blocked (HWAS)"},
{layout_blocked_tra, "blocked (TRA)"}, {layout_blocked_tra, "blocked (TRA)"},
@ -697,7 +697,7 @@ static const layout_info layout_info_list[] = {
{layout_blocked_sthd, "blocked (STHD)"}, {layout_blocked_sthd, "blocked (STHD)"},
{layout_blocked_h4m, "blocked (H4M)"}, {layout_blocked_h4m, "blocked (H4M)"},
{layout_blocked_xa_aiff, "blocked (XA AIFF)"}, {layout_blocked_xa_aiff, "blocked (XA AIFF)"},
{layout_blocked_vs_ffx, "blocked (Square VS)"}, {layout_blocked_vs_square, "blocked (Square VS)"},
}; };
static const meta_info meta_info_list[] = { static const meta_info meta_info_list[] = {
@ -976,7 +976,7 @@ static const meta_info meta_info_list[] = {
{meta_X360_TRA, "Terminal Reality .TRA raw header"}, {meta_X360_TRA, "Terminal Reality .TRA raw header"},
{meta_PS2_VGS, "Princess Soft VGS header"}, {meta_PS2_VGS, "Princess Soft VGS header"},
{meta_PS2_IAB, "Runtime .IAB header"}, {meta_PS2_IAB, "Runtime .IAB header"},
{meta_PS2_STRLR, "The Bouncer STR header"}, {meta_VS_STR, "Square .VS STR* header"},
{meta_LSF_N1NJ4N, ".lsf !n1nj4n header"}, {meta_LSF_N1NJ4N, ".lsf !n1nj4n header"},
{meta_VAWX, "feelplus VAWX header"}, {meta_VAWX, "feelplus VAWX header"},
{meta_PC_SNDS, "assumed Heavy Iron IMA by .snds extension"}, {meta_PC_SNDS, "assumed Heavy Iron IMA by .snds extension"},
@ -1116,7 +1116,7 @@ static const meta_info meta_info_list[] = {
{meta_XWMA, "Microsoft XWMA RIFF header"}, {meta_XWMA, "Microsoft XWMA RIFF header"},
{meta_VA3, "Konami VA3 header" }, {meta_VA3, "Konami VA3 header" },
{meta_XOPUS, "Exient XOPUS header"}, {meta_XOPUS, "Exient XOPUS header"},
{meta_VS_FFX, "Square VS header"}, {meta_VS_SQUARE, "Square VS header"},
{meta_NWAV, "Chunsoft NWAV header"}, {meta_NWAV, "Chunsoft NWAV header"},
{meta_XPCM, "Circus XPCM header"}, {meta_XPCM, "Circus XPCM header"},
{meta_MSF_TAMASOFT, "Tama-Soft MSF header"}, {meta_MSF_TAMASOFT, "Tama-Soft MSF header"},

8
src/layout/blocked.c
View File

@ -163,8 +163,8 @@ void block_update(off_t block_offset, VGMSTREAM * vgmstream) {
case layout_blocked_ps2_iab: case layout_blocked_ps2_iab:
block_update_ps2_iab(block_offset,vgmstream); block_update_ps2_iab(block_offset,vgmstream);
break; break;
case layout_blocked_ps2_strlr: case layout_blocked_vs_str:
block_update_ps2_strlr(block_offset,vgmstream); block_update_vs_str(block_offset,vgmstream);
break; break;
case layout_blocked_rws: case layout_blocked_rws:
block_update_rws(block_offset,vgmstream); block_update_rws(block_offset,vgmstream);
@ -202,8 +202,8 @@ void block_update(off_t block_offset, VGMSTREAM * vgmstream) {
case layout_blocked_xa_aiff: case layout_blocked_xa_aiff:
block_update_xa_aiff(block_offset,vgmstream); block_update_xa_aiff(block_offset,vgmstream);
break; break;
case layout_blocked_vs_ffx: case layout_blocked_vs_square:
block_update_vs_ffx(block_offset,vgmstream); block_update_vs_square(block_offset,vgmstream);
break; break;
default: /* not a blocked layout */ default: /* not a blocked layout */
break; break;

2
src/layout/blocked_ps2_strlr.c
View File

@ -2,7 +2,7 @@
#include "../vgmstream.h" #include "../vgmstream.h"
/* The Bouncer STRx blocks, one block per channel when stereo */ /* The Bouncer STRx blocks, one block per channel when stereo */
void block_update_ps2_strlr(off_t block_offset, VGMSTREAM * vgmstream) { void block_update_vs_str(off_t block_offset, VGMSTREAM * vgmstream) {
STREAMFILE* streamFile = vgmstream->ch[0].streamfile; STREAMFILE* streamFile = vgmstream->ch[0].streamfile;
int i; int i;

2
src/layout/blocked_vs_ffx.c
View File

@ -2,7 +2,7 @@
#include "../vgmstream.h" #include "../vgmstream.h"
/* Square "VS" headered blocks */ /* Square "VS" headered blocks */
void block_update_vs_ffx(off_t block_offset, VGMSTREAM * vgmstream) { void block_update_vs_square(off_t block_offset, VGMSTREAM * vgmstream) {
int i; int i;
size_t block_size = 0x800; size_t block_size = 0x800;

4
src/layout/layout.h
View File

@ -32,7 +32,7 @@ void block_update_adm(off_t block_offset, VGMSTREAM * vgmstream);
void block_update_bdsp(off_t block_offset, VGMSTREAM * vgmstream); void block_update_bdsp(off_t block_offset, VGMSTREAM * vgmstream);
void block_update_tra(off_t block_offset, VGMSTREAM * vgmstream); void block_update_tra(off_t block_offset, VGMSTREAM * vgmstream);
void block_update_ps2_iab(off_t block_offset, VGMSTREAM * vgmstream); void block_update_ps2_iab(off_t block_offset, VGMSTREAM * vgmstream);
void block_update_ps2_strlr(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); void block_update_rws(off_t block_offset, VGMSTREAM * vgmstream);
void block_update_hwas(off_t block_offset, VGMSTREAM * vgmstream); void block_update_hwas(off_t block_offset, VGMSTREAM * vgmstream);
void block_update_ea_sns(off_t block_offset, VGMSTREAM * vgmstream); void block_update_ea_sns(off_t block_offset, VGMSTREAM * vgmstream);
@ -45,7 +45,7 @@ void block_update_ea_wve_ad10(off_t block_offset, VGMSTREAM * vgmstream);
void block_update_sthd(off_t block_offset, VGMSTREAM * vgmstream); void block_update_sthd(off_t block_offset, VGMSTREAM * vgmstream);
void block_update_h4m(off_t block_offset, VGMSTREAM * vgmstream); void block_update_h4m(off_t block_offset, VGMSTREAM * vgmstream);
void block_update_xa_aiff(off_t block_offset, VGMSTREAM * vgmstream); void block_update_xa_aiff(off_t block_offset, VGMSTREAM * vgmstream);
void block_update_vs_ffx(off_t block_offset, VGMSTREAM * vgmstream); void block_update_vs_square(off_t block_offset, VGMSTREAM * vgmstream);
/* other layouts */ /* other layouts */
void render_vgmstream_interleave(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstream); void render_vgmstream_interleave(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstream);

4
src/meta/meta.h
View File

@ -533,7 +533,7 @@ VGMSTREAM * init_vgmstream_x360_tra(STREAMFILE* streamFile);
VGMSTREAM * init_vgmstream_ps2_iab(STREAMFILE* streamFile); VGMSTREAM * init_vgmstream_ps2_iab(STREAMFILE* streamFile);
VGMSTREAM * init_vgmstream_ps2_strlr(STREAMFILE* streamFile); VGMSTREAM * init_vgmstream_vs_str(STREAMFILE* streamFile);
VGMSTREAM * init_vgmstream_lsf_n1nj4n(STREAMFILE* streamFile); VGMSTREAM * init_vgmstream_lsf_n1nj4n(STREAMFILE* streamFile);
@ -800,7 +800,7 @@ VGMSTREAM * init_vgmstream_xwma(STREAMFILE * streamFile);
VGMSTREAM * init_vgmstream_xopus(STREAMFILE * streamFile); VGMSTREAM * init_vgmstream_xopus(STREAMFILE * streamFile);
VGMSTREAM * init_vgmstream_vs_ffx(STREAMFILE * streamFile); VGMSTREAM * init_vgmstream_vs_square(STREAMFILE * streamFile);
VGMSTREAM * init_vgmstream_msf_banpresto_wmsf(STREAMFILE * streamFile); VGMSTREAM * init_vgmstream_msf_banpresto_wmsf(STREAMFILE * streamFile);
VGMSTREAM * init_vgmstream_msf_banpresto_2msf(STREAMFILE * streamFile); VGMSTREAM * init_vgmstream_msf_banpresto_2msf(STREAMFILE * streamFile);

6
src/meta/ps2_strlr.c
View File

@ -3,7 +3,7 @@
#include "../coding/coding.h" #include "../coding/coding.h"
/* .vs/STRx - from The Bouncer (PS2) */ /* .vs/STRx - from The Bouncer (PS2) */
VGMSTREAM * init_vgmstream_ps2_strlr(STREAMFILE *streamFile) { VGMSTREAM * init_vgmstream_vs_str(STREAMFILE *streamFile) {
VGMSTREAM * vgmstream = NULL; VGMSTREAM * vgmstream = NULL;
int channel_count, loop_flag; int channel_count, loop_flag;
off_t start_offset; off_t start_offset;
@ -29,10 +29,10 @@ VGMSTREAM * init_vgmstream_ps2_strlr(STREAMFILE *streamFile) {
vgmstream = allocate_vgmstream(channel_count,loop_flag); vgmstream = allocate_vgmstream(channel_count,loop_flag);
if (!vgmstream) goto fail; if (!vgmstream) goto fail;
vgmstream->meta_type = meta_PS2_STRLR; vgmstream->meta_type = meta_VS_STR;
vgmstream->sample_rate = 44100; vgmstream->sample_rate = 44100;
vgmstream->coding_type = coding_PSX; vgmstream->coding_type = coding_PSX;
vgmstream->layout_type = layout_blocked_ps2_strlr; vgmstream->layout_type = layout_blocked_vs_str;
if (!vgmstream_open_stream(vgmstream,streamFile,start_offset)) if (!vgmstream_open_stream(vgmstream,streamFile,start_offset))
goto fail; goto fail;

6
src/meta/vs_ffx.c
View File

@ -4,7 +4,7 @@
/* VS - VagStream from Square games [Final Fantasy X (PS2) voices, Unlimited Saga (PS2) voices, All Star Pro-Wrestling 2/3 (PS2) music] */ /* VS - VagStream from Square games [Final Fantasy X (PS2) voices, Unlimited Saga (PS2) voices, All Star Pro-Wrestling 2/3 (PS2) music] */
VGMSTREAM * init_vgmstream_vs_ffx(STREAMFILE *streamFile) { VGMSTREAM * init_vgmstream_vs_square(STREAMFILE *streamFile) {
VGMSTREAM * vgmstream = NULL; VGMSTREAM * vgmstream = NULL;
int channel_count, loop_flag, pitch, flags; int channel_count, loop_flag, pitch, flags;
off_t start_offset; off_t start_offset;
@ -39,10 +39,10 @@ VGMSTREAM * init_vgmstream_vs_ffx(STREAMFILE *streamFile) {
vgmstream = allocate_vgmstream(channel_count,loop_flag); vgmstream = allocate_vgmstream(channel_count,loop_flag);
if (!vgmstream) goto fail; if (!vgmstream) goto fail;
vgmstream->meta_type = meta_VS_FFX; vgmstream->meta_type = meta_VS_SQUARE;
vgmstream->sample_rate = round10((48000 * pitch) / 4096); /* needed for rare files */ vgmstream->sample_rate = round10((48000 * pitch) / 4096); /* needed for rare files */
vgmstream->coding_type = coding_PSX; vgmstream->coding_type = coding_PSX;
vgmstream->layout_type = layout_blocked_vs_ffx; vgmstream->layout_type = layout_blocked_vs_square;
if (!vgmstream_open_stream(vgmstream,streamFile,start_offset)) if (!vgmstream_open_stream(vgmstream,streamFile,start_offset))
goto fail; goto fail;

8
src/vgmstream.c
View File

@ -289,7 +289,7 @@ VGMSTREAM * (*init_vgmstream_functions[])(STREAMFILE *streamFile) = {
init_vgmstream_ps2_spm, init_vgmstream_ps2_spm,
init_vgmstream_x360_tra, init_vgmstream_x360_tra,
init_vgmstream_ps2_iab, init_vgmstream_ps2_iab,
init_vgmstream_ps2_strlr, init_vgmstream_vs_str,
init_vgmstream_lsf_n1nj4n, init_vgmstream_lsf_n1nj4n,
init_vgmstream_vawx, init_vgmstream_vawx,
init_vgmstream_ps2_wmus, init_vgmstream_ps2_wmus,
@ -443,7 +443,7 @@ VGMSTREAM * (*init_vgmstream_functions[])(STREAMFILE *streamFile) = {
init_vgmstream_ue4opus, init_vgmstream_ue4opus,
init_vgmstream_xwma, init_vgmstream_xwma,
init_vgmstream_xopus, init_vgmstream_xopus,
init_vgmstream_vs_ffx, init_vgmstream_vs_square,
init_vgmstream_msf_banpresto_wmsf, init_vgmstream_msf_banpresto_wmsf,
init_vgmstream_msf_banpresto_2msf, init_vgmstream_msf_banpresto_2msf,
init_vgmstream_nwav, init_vgmstream_nwav,
@ -1015,7 +1015,7 @@ void render_vgmstream(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstre
case layout_blocked_bdsp: case layout_blocked_bdsp:
case layout_blocked_tra: case layout_blocked_tra:
case layout_blocked_ps2_iab: case layout_blocked_ps2_iab:
case layout_blocked_ps2_strlr: case layout_blocked_vs_str:
case layout_blocked_rws: case layout_blocked_rws:
case layout_blocked_hwas: case layout_blocked_hwas:
case layout_blocked_ea_sns: case layout_blocked_ea_sns:
@ -1028,7 +1028,7 @@ void render_vgmstream(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstre
case layout_blocked_sthd: case layout_blocked_sthd:
case layout_blocked_h4m: case layout_blocked_h4m:
case layout_blocked_xa_aiff: case layout_blocked_xa_aiff:
case layout_blocked_vs_ffx: case layout_blocked_vs_square:
render_vgmstream_blocked(buffer,sample_count,vgmstream); render_vgmstream_blocked(buffer,sample_count,vgmstream);
break; break;
case layout_aix: case layout_aix:

8
src/vgmstream.h
View File

@ -240,7 +240,7 @@ typedef enum {
layout_blocked_ivaud, /* GTA IV .ivaud blocks */ layout_blocked_ivaud, /* GTA IV .ivaud blocks */
layout_blocked_tra, /* DefJam Rapstar .tra blocks */ layout_blocked_tra, /* DefJam Rapstar .tra blocks */
layout_blocked_ps2_iab, layout_blocked_ps2_iab,
layout_blocked_ps2_strlr, layout_blocked_vs_str,
layout_blocked_rws, layout_blocked_rws,
layout_blocked_hwas, layout_blocked_hwas,
layout_blocked_ea_sns, /* newest Electronic Arts blocks, found in SNS/SNU/SPS/etc formats */ layout_blocked_ea_sns, /* newest Electronic Arts blocks, found in SNS/SNU/SPS/etc formats */
@ -253,7 +253,7 @@ typedef enum {
layout_blocked_sthd, /* Dream Factory STHD */ layout_blocked_sthd, /* Dream Factory STHD */
layout_blocked_h4m, /* H4M video */ layout_blocked_h4m, /* H4M video */
layout_blocked_xa_aiff, /* XA in AIFF files [Crusader: No Remorse (SAT), Road Rash (3DO)] */ layout_blocked_xa_aiff, /* XA in AIFF files [Crusader: No Remorse (SAT), Road Rash (3DO)] */
layout_blocked_vs_ffx, layout_blocked_vs_square,
/* otherwise odd */ /* otherwise odd */
layout_aix, /* CRI AIX's wheels within wheels */ layout_aix, /* CRI AIX's wheels within wheels */
@ -565,7 +565,7 @@ typedef enum {
meta_X360_TRA, /* Def Jam Rapstar */ meta_X360_TRA, /* Def Jam Rapstar */
meta_PS2_VGS, /* Princess Soft PS2 games */ meta_PS2_VGS, /* Princess Soft PS2 games */
meta_PS2_IAB, /* Ueki no Housoku - Taosu ze Robert Juudan!! (PS2) */ meta_PS2_IAB, /* Ueki no Housoku - Taosu ze Robert Juudan!! (PS2) */
meta_PS2_STRLR, /* The Bouncer */ meta_VS_STR, /* The Bouncer */
meta_LSF_N1NJ4N, /* .lsf n1nj4n Fastlane Street Racing (iPhone) */ meta_LSF_N1NJ4N, /* .lsf n1nj4n Fastlane Street Racing (iPhone) */
meta_VAWX, /* feelplus: No More Heroes Heroes Paradise, Moon Diver */ meta_VAWX, /* feelplus: No More Heroes Heroes Paradise, Moon Diver */
meta_PC_SNDS, /* Incredibles PC .snds */ meta_PC_SNDS, /* Incredibles PC .snds */
@ -700,7 +700,7 @@ typedef enum {
meta_XWMA, meta_XWMA,
meta_VA3, /* DDR Supernova 2 AC */ meta_VA3, /* DDR Supernova 2 AC */
meta_XOPUS, meta_XOPUS,
meta_VS_FFX, meta_VS_SQUARE,
meta_NWAV, meta_NWAV,
meta_XPCM, meta_XPCM,
meta_MSF_TAMASOFT, meta_MSF_TAMASOFT,