From 3097ca83dc096dd2a0711f777d0bccb2ed1655ac Mon Sep 17 00:00:00 2001
From: bnnm <bananaman255@gmail.com>
Date: Thu, 1 Oct 2020 22:02:54 +0200
Subject: [PATCH] Rename vawx to xwav

---
 src/formats.c                                 | 2 +-
 src/layout/blocked.c                          | 4 ++--
 src/layout/{blocked_vawx.c => blocked_xwav.c} | 2 +-
 src/layout/layout.h                           | 2 +-
 src/libvgmstream.vcproj                       | 4 ++--
 src/libvgmstream.vcxproj                      | 4 ++--
 src/libvgmstream.vcxproj.filters              | 4 ++--
 src/meta/{vawx.c => xwav.c}                   | 2 +-
 src/render.c                                  | 2 +-
 src/vgmstream.h                               | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)
 rename src/layout/{blocked_vawx.c => blocked_xwav.c} (88%)
 rename src/meta/{vawx.c => xwav.c} (99%)

diff --git a/src/formats.c b/src/formats.c
index dd45267f..35134887 100644
--- a/src/formats.c
+++ b/src/formats.c
@@ -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)"},
diff --git a/src/layout/blocked.c b/src/layout/blocked.c
index fe7696c6..c28c4fe0 100644
--- a/src/layout/blocked.c
+++ b/src/layout/blocked.c
@@ -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);
diff --git a/src/layout/blocked_vawx.c b/src/layout/blocked_xwav.c
similarity index 88%
rename from src/layout/blocked_vawx.c
rename to src/layout/blocked_xwav.c
index dd28dc7e..ddd5dafb 100644
--- a/src/layout/blocked_vawx.c
+++ b/src/layout/blocked_xwav.c
@@ -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;
 
diff --git a/src/layout/layout.h b/src/layout/layout.h
index 2b6405dc..db4beef0 100644
--- a/src/layout/layout.h
+++ b/src/layout/layout.h
@@ -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);
diff --git a/src/libvgmstream.vcproj b/src/libvgmstream.vcproj
index 6aec988a..f6a1d53a 100644
--- a/src/libvgmstream.vcproj
+++ b/src/libvgmstream.vcproj
@@ -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
diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj
index 237098e9..596b59d7 100644
--- a/src/libvgmstream.vcxproj
+++ b/src/libvgmstream.vcxproj
@@ -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" />
diff --git a/src/libvgmstream.vcxproj.filters b/src/libvgmstream.vcxproj.filters
index f37dd0f8..6fab04b2 100644
--- a/src/libvgmstream.vcxproj.filters
+++ b/src/libvgmstream.vcxproj.filters
@@ -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">
diff --git a/src/meta/vawx.c b/src/meta/xwav.c
similarity index 99%
rename from src/meta/vawx.c
rename to src/meta/xwav.c
index f35c4c6f..d3a0c8e4 100644
--- a/src/meta/vawx.c
+++ b/src/meta/xwav.c
@@ -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;
diff --git a/src/render.c b/src/render.c
index 1bcd8ffe..5c5800bf 100644
--- a/src/render.c
+++ b/src/render.c
@@ -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:
diff --git a/src/vgmstream.h b/src/vgmstream.h
index 9360a501..73667d31 100644
--- a/src/vgmstream.h
+++ b/src/vgmstream.h
@@ -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 */