cleanup: renames

src/formats.c

@@ -1239,17 +1239,17 @@ static const meta_info meta_info_list[] = {
         {meta_PS2_VDS_VDM,          "Procyon Studio VDS/VDM header"},
         {meta_FFMPEG,               "FFmpeg supported format"},
         {meta_FFMPEG_faulty,        "FFmpeg supported format (check log)"},
-        {meta_X360_CXS,             "tri-Crescendo CXS header"},
+        {meta_CXS,                  "tri-Crescendo CXS header"},
         {meta_AKB,                  "Square-Enix AKB header"},
-        {meta_X360_PASX,            "Premium Agency PASX header"},
+        {meta_PASX,                 "Premium Agency PASX header"},
         {meta_XMA_RIFF,             "Microsoft XMA RIFF header"},
-        {meta_X360_AST,             "Capcom AST (X360) header"},
+        {meta_ASTB,                 "Capcom ASTB header"},
         {meta_WWISE_RIFF,           "Audiokinetic Wwise RIFF header"},
         {meta_UBI_RAKI,             "Ubisoft RAKI header"},
         {meta_SXD,                  "Sony SXD header"},
         {meta_OGL,                  "Shin'en OGL header"},
         {meta_MC3,                  "Paradigm MC3 header"},
-        {meta_GTD,                  "GTD/GHS header"},
+        {meta_GTD,                  "Hexadrive GHS/S_P_STH header"},
         {meta_TA_AAC,               "tri-Ace AAC header"},
         {meta_MTA2,                 "Konami MTA2 header"},
         {meta_NGC_ULW,              "Criterion ULW raw header"},

src/libvgmstream.vcxproj

@@ -338,6 +338,7 @@
     <ClCompile Include="meta\apple_caff.c" />
     <ClCompile Include="meta\asf.c" />
     <ClCompile Include="meta\ast.c" />
+    <ClCompile Include="meta\astb.c" />
     <ClCompile Include="meta\ast_mmv.c" />
     <ClCompile Include="meta\ast_mv.c" />
     <ClCompile Include="meta\atsl.c" />
@@ -370,6 +371,7 @@
     <ClCompile Include="meta\csb.c" />
     <ClCompile Include="meta\csmp.c" />
     <ClCompile Include="meta\cstr.c" />
+    <ClCompile Include="meta\cxs.c" />
     <ClCompile Include="meta\dcs_wav.c" />
     <ClCompile Include="meta\dc_asd.c" />
     <ClCompile Include="meta\dc_idvi.c" />
@@ -516,6 +518,7 @@
     <ClCompile Include="meta\opus.c" />
     <ClCompile Include="meta\otm.c" />
     <ClCompile Include="meta\p3d.c" />
+    <ClCompile Include="meta\pasx.c" />
     <ClCompile Include="meta\pcm_sre.c" />
     <ClCompile Include="meta\pcm_success.c" />
     <ClCompile Include="meta\pc_ast.c" />
@@ -688,9 +691,6 @@
     <ClCompile Include="meta\wvs.c" />
     <ClCompile Include="meta\wwise.c" />
     <ClCompile Include="meta\wxd_wxh.c" />
-    <ClCompile Include="meta\x360_ast.c" />
-    <ClCompile Include="meta\x360_cxs.c" />
-    <ClCompile Include="meta\x360_pasx.c" />
     <ClCompile Include="meta\x360_tra.c" />
     <ClCompile Include="meta\xa.c" />
     <ClCompile Include="meta\xau.c" />

src/libvgmstream.vcxproj.filters

@@ -835,6 +835,9 @@
     <ClCompile Include="meta\ast.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="meta\astb.c">
+      <Filter>meta\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="meta\ast_mmv.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
@@ -931,6 +934,9 @@
     <ClCompile Include="meta\cstr.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="meta\cxs.c">
+      <Filter>meta\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="meta\dcs_wav.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
@@ -1369,6 +1375,9 @@
     <ClCompile Include="meta\p3d.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="meta\pasx.c">
+      <Filter>meta\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="meta\pcm_sre.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
@@ -1885,15 +1894,6 @@
     <ClCompile Include="meta\wxd_wxh.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta\x360_ast.c">
-      <Filter>meta\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="meta\x360_cxs.c">
-      <Filter>meta\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="meta\x360_pasx.c">
-      <Filter>meta\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="meta\x360_tra.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>

src/meta/astb.c

@@ -2,7 +2,7 @@
 #include "../coding/coding.h"
 
 /* ASTB - found in Dead Rising (X360) */
-VGMSTREAM* init_vgmstream_x360_ast(STREAMFILE* sf) {
+VGMSTREAM* init_vgmstream_astb(STREAMFILE* sf) {
     VGMSTREAM* vgmstream = NULL;
     off_t start_offset, data_size;
     int loop_flag, channels;
@@ -35,7 +35,7 @@ VGMSTREAM* init_vgmstream_x360_ast(STREAMFILE* sf) {
     if (!vgmstream) goto fail;
 
     vgmstream->sample_rate = read_s32be(0x40,sf);
-    vgmstream->meta_type = meta_X360_AST;
+    vgmstream->meta_type = meta_ASTB;
 
     {
         /* manually find sample offsets (XMA1 nonsense again) */

src/meta/cxs.c

@@ -2,23 +2,23 @@
 #include "../coding/coding.h"
 
 /* CXS - found in Eternal Sonata (X360) */
-VGMSTREAM* init_vgmstream_x360_cxs(STREAMFILE* sf) {
+VGMSTREAM* init_vgmstream_cxs(STREAMFILE* sf) {
     VGMSTREAM* vgmstream = NULL;
     off_t start_offset;
-    int loop_flag, channel_count;
+    int loop_flag, channels;
 
     /* checks */
-    if ( !check_extensions(sf,"cxs"))
+    if (!is_id32be(0x00,sf, "CXS "))
         goto fail;
-    if (read_32bitBE(0x00,sf) != 0x43585320)   /* "CXS " */
+    if (!check_extensions(sf,"cxs"))
         goto fail;
 
     loop_flag = read_32bitBE(0x18,sf) > 0;
-    channel_count = read_32bitBE(0x0c,sf);
+    channels = read_32bitBE(0x0c,sf);
     start_offset = read_32bitBE(0x04,sf) + read_32bitBE(0x28,sf); /* assumed, seek table always at 0x800 */
 
     /* build the VGMSTREAM */
-    vgmstream = allocate_vgmstream(channel_count,loop_flag);
+    vgmstream = allocate_vgmstream(channels, loop_flag);
     if (!vgmstream) goto fail;
 
     /*  0x04: data start? */
@@ -28,7 +28,7 @@ VGMSTREAM* init_vgmstream_x360_cxs(STREAMFILE* sf) {
     vgmstream->loop_end_sample = read_32bitBE(0x18,sf);
     /* 0x1c: below */
 
-    vgmstream->meta_type = meta_X360_CXS;
+    vgmstream->meta_type = meta_CXS;
 
 #ifdef VGM_USE_FFMPEG
     {

src/meta/meta.h

@@ -578,21 +578,21 @@ VGMSTREAM * init_vgmstream_bik(STREAMFILE* streamFile);
 
 VGMSTREAM * init_vgmstream_ps2_vds_vdm(STREAMFILE* streamFile);
 
-VGMSTREAM * init_vgmstream_x360_cxs(STREAMFILE* streamFile);
+VGMSTREAM * init_vgmstream_cxs(STREAMFILE* streamFile);
 
 VGMSTREAM * init_vgmstream_dsp_adx(STREAMFILE *streamFile);
 
 VGMSTREAM * init_vgmstream_akb(STREAMFILE *streamFile);
 VGMSTREAM * init_vgmstream_akb2(STREAMFILE *streamFile);
 
-VGMSTREAM * init_vgmstream_x360_ast(STREAMFILE *streamFile);
+VGMSTREAM* init_vgmstream_astb(STREAMFILE* sf);
 
 VGMSTREAM* init_vgmstream_wwise(STREAMFILE* sf);
 VGMSTREAM* init_vgmstream_wwise_bnk(STREAMFILE* sf, int* p_prefetch);
 
 VGMSTREAM * init_vgmstream_ubi_raki(STREAMFILE* streamFile);
 
-VGMSTREAM * init_vgmstream_x360_pasx(STREAMFILE *streamFile);
+VGMSTREAM* init_vgmstream_pasx(STREAMFILE* sf);
 
 VGMSTREAM * init_vgmstream_sxd(STREAMFILE *streamFile);
 

src/meta/pasx.c

@@ -2,7 +2,7 @@
 #include "../coding/coding.h"
 
 /* PASX - from Premium Agency games [SoulCalibur II HD (X360), Death By Cube (X360)] */
-VGMSTREAM* init_vgmstream_x360_pasx(STREAMFILE* sf) {
+VGMSTREAM* init_vgmstream_pasx(STREAMFILE* sf) {
     VGMSTREAM* vgmstream = NULL;
     off_t start_offset, chunk_offset;
     size_t data_size, chunk_size;
@@ -39,7 +39,7 @@ VGMSTREAM* init_vgmstream_x360_pasx(STREAMFILE* sf) {
     vgmstream->num_samples = num_samples;
     vgmstream->loop_start_sample = loop_start_sample;
     vgmstream->loop_end_sample   = loop_end_sample;
-    vgmstream->meta_type = meta_X360_PASX;
+    vgmstream->meta_type = meta_PASX;
 
 #ifdef VGM_USE_FFMPEG
     {

src/vgmstream.c

@@ -279,7 +279,7 @@ VGMSTREAM* (*init_vgmstream_functions[])(STREAMFILE* sf) = {
     init_vgmstream_hca,
     init_vgmstream_svag_snk,
     init_vgmstream_ps2_vds_vdm,
-    init_vgmstream_x360_cxs,
+    init_vgmstream_cxs,
     init_vgmstream_dsp_adx,
     init_vgmstream_akb,
     init_vgmstream_akb2,
@@ -287,10 +287,10 @@ VGMSTREAM* (*init_vgmstream_functions[])(STREAMFILE* sf) = {
     init_vgmstream_mp4_aac_ffmpeg,
 #endif
     init_vgmstream_bik,
-    init_vgmstream_x360_ast,
+    init_vgmstream_astb,
     init_vgmstream_wwise,
     init_vgmstream_ubi_raki,
-    init_vgmstream_x360_pasx,
+    init_vgmstream_pasx,
     init_vgmstream_xma,
     init_vgmstream_sxd,
     init_vgmstream_ogl,

src/vgmstream.h

@@ -585,17 +585,17 @@ typedef enum {
     meta_PS2_VDS_VDM,       /* Graffiti Kingdom */
     meta_FFMPEG,
     meta_FFMPEG_faulty,
-    meta_X360_CXS,          /* Eternal Sonata (Xbox 360) */
+    meta_CXS,
-    meta_AKB,               /* SQEX iOS */
+    meta_AKB,
-    meta_X360_PASX,         /* Namco PASX (Soul Calibur II HD X360) */
+    meta_PASX,
-    meta_XMA_RIFF,          /* Microsoft RIFF XMA */
+    meta_XMA_RIFF,
-    meta_X360_AST,          /* Dead Rising (X360) */
+    meta_ASTB,
     meta_WWISE_RIFF,        /* Audiokinetic Wwise RIFF/RIFX */
     meta_UBI_RAKI,          /* Ubisoft RAKI header (Rayman Legends, Just Dance 2017) */
     meta_SXD,               /* Sony SXD (Gravity Rush, Freedom Wars PSV) */
     meta_OGL,               /* Shin'en Wii/WiiU (Jett Rocket (Wii), FAST Racing NEO (WiiU)) */
     meta_MC3,               /* Paradigm games (T3 PS2, MX Rider PS2, MI: Operation Surma PS2) */
-    meta_GTD,               /* Knights Contract (X360/PS3), Valhalla Knights 3 (PSV) */
+    meta_GTD,
     meta_TA_AAC,
     meta_MTA2,
     meta_NGC_ULW,           /* Burnout 1 (GC only) */
@@ -603,7 +603,7 @@ typedef enum {
     meta_XA_04SW,
     meta_TXTH,              /* generic text header */
     meta_SK_AUD,            /* Silicon Knights .AUD (Eternal Darkness GC) */
-    meta_AHX,               /* CRI AHX header */
+    meta_AHX,
     meta_STM,               /* Angel Studios/Rockstar San Diego Games */
     meta_BINK,              /* RAD Game Tools BINK audio/video */
     meta_EA_SNU,            /* Electronic Arts SNU (Dead Space) */