From 0c440429443f115fba07bc49c63fc28573a4b25d Mon Sep 17 00:00:00 2001
From: bnnm <bananaman255@gmail.com>
Date: Sat, 20 Jan 2024 18:15:24 +0100
Subject: [PATCH] cleanup: renames

---
 doc/FORMATS.md                   | 46 +++++++++++++++++---------------
 src/libvgmstream.vcxproj         |  3 ++-
 src/libvgmstream.vcxproj.filters |  9 ++++---
 src/meta/{ios_psnd.c => psnd.c}  |  0
 4 files changed, 32 insertions(+), 26 deletions(-)
 rename src/meta/{ios_psnd.c => psnd.c} (100%)

diff --git a/doc/FORMATS.md b/doc/FORMATS.md
index c3b98efc..a17a8334 100644
--- a/doc/FORMATS.md
+++ b/doc/FORMATS.md
@@ -380,9 +380,9 @@ different internally (encrypted, different versions, etc) and not always can be
   - InterPlay MUS ACM header [*MUS_ACM*]
   - *mus_acm*: `.mus`
     - Subfiles: *acm ogg_vorbis*
-- **ps2_kces.c**
-  - Konami KCES Header [*PS2_KCES*]
-  - *ps2_kces*: `.kces`
+- **vig_kces.c**
+  - Konami .VIG Header [*VIG_KCES*]
+  - *vig_kces*: `.vig`
   - Codecs: PSX
 - **hxd.c**
   - Tecmo HXD Header [*HXD*]
@@ -587,13 +587,13 @@ different internally (encrypted, different versions, etc) and not always can be
   - Alfa System .STS header [*STS*]
   - *sts*: `.sts`
   - Codecs: NGC_DSP
-- **ps2_p2bt.c**
-  - Pop'n'Music 7 Header [*PS2_P2BT*]
-  - *ps2_p2bt*: `.p2bt`
+- **p2bt_move_visa.c**
+  - Konami P2BT/MOVE/VISA header [*P2BT_MOVE_VISA*]
+  - *p2bt_move_visa*: `.p2bt .move .vis`
   - Codecs: PSX
-- **ps2_gbts.c**
-  - Pop'n'Music 9 Header [*PS2_GBTS*]
-  - *ps2_gbts*: `.gbts`
+- **gbts.c**
+  - Konami GBTS header [*GBTS*]
+  - *gbts*: `.gbts`
   - Codecs: PSX
 - **wii_sng.c**
   - SNG DSP Header [*WII_SNG*]
@@ -652,7 +652,8 @@ different internally (encrypted, different versions, etc) and not always can be
   - *vgs_ps*: `.vgs`
   - Codecs: PSX
 - **redspark.c**
-  - RedSpark Header [*REDSPARK*]
+  - RedSpark header [*REDSPARK*]
+  - *redspark*: `.rsd`
   - Codecs: NGC_DSP
 - **ps2_sps.c**
   - Ape Escape 2 SPS Header [*PS2_SPS*]
@@ -831,7 +832,7 @@ different internally (encrypted, different versions, etc) and not always can be
   - Square Enix SCD header [*SQEX_SCD*]
   - *sqex_scd*: `.scd`
     - Subfiles: *ogg_vorbis_config*
-  - Codecs: OGG PCM16LE PSX MPEG MSADPCM NGC_DSP XMA ATRAC3 ATRAC9
+  - Codecs: OGG PCM16BE PCM16LE PSX MPEG MSADPCM NGC_DSP XMA ATRAC3 ATRAC9
 - **ngc_nst_dsp.c**
   - Animaniacs NST header [*NGC_NST_DSP*]
   - *ngc_nst_dsp*: `.dsp`
@@ -881,10 +882,10 @@ different internally (encrypted, different versions, etc) and not always can be
   - Mattel Hyperscan KVAG [*HYPERSCAN_KVAG*]
   - *hyperscan_kvag*: `.bvg`
   - Codecs: DVI_IMA
-- **ios_psnd.c**
-  - PSND Header [*IOS_PSND*]
-  - *ios_psnd*: `.psnd`
-  - Codecs: PCM16LE
+- **psnd.c**
+  - Polarbit PSND header [*PSND*]
+  - *psnd*: `.psn`
+  - Codecs: PCM16LE DVI_IMA
 - **adp_wildfire.c**
   - Wildfire ADP! header [*ADP_WILDFIRE*]
   - *adp_wildfire*: `.adp`
@@ -927,9 +928,9 @@ different internally (encrypted, different versions, etc) and not always can be
   - Namco IVAG header [*IVAG*]
   - *ivag*: `.ivag`
   - Codecs: PSX
-- **ps2_2pfs.c**
-  - Konami 2PFS header [*PS2_2PFS*]
-  - *ps2_2pfs*: `.sap .2pfs`
+- **2pfs.c**
+  - Konami 2PFS header [*2PFS*]
+  - *2pfs*: `.sap`
   - Codecs: PSX
 - **xnb.c**
   - Microsoft XNA Game Studio header [*XNB*]
@@ -1339,10 +1340,6 @@ different internally (encrypted, different versions, etc) and not always can be
   - High Voltage SVG header [*SVG*]
   - *svg*: `.svg`
   - Codecs: PSX
-- **vis.c**
-  - Konami VIS header [*VIS*]
-  - *vis*: `.vis`
-  - Codecs: PSX
 - **vai.c**
   - Asobo Studio .VAI header [*VAI*]
   - *vai*: `.vai`
@@ -1590,6 +1587,7 @@ different internally (encrypted, different versions, etc) and not always can be
   - Koei Tecmo WaveBank header [*KWB*]
   - *kwb*: `.wbd .wb2 .sed + .wbh .whd .wh2`
   - *xws*: `.xws`
+  - *snd_koei*: `.snd`
   - *koei_wavebank*
     - Subfiles: *msf dsp_apex*
   - Codecs: PCM16LE MSADPCM NGC_DSP XMA2 ATRAC9
@@ -1814,6 +1812,10 @@ different internally (encrypted, different versions, etc) and not always can be
   - Ubisoft GWB+GWD header [*GWB_GWD*]
   - *gwb_gwd*: `.gwb + .gwd`
   - Codecs: NGC_DSP
+- **cbx.c**
+  - Traveller's Tales CBX header [*CBX*]
+  - *cbx*: `.cbx`
+  - Codecs: EA_MT
 - **scd_pcm.c**
   - Lunar: Eternal Blue .PCM header [*SCD_PCM*]
   - *scd_pcm*: `.pcm`
diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj
index f4d1fa2d..4c4104f7 100644
--- a/src/libvgmstream.vcxproj
+++ b/src/libvgmstream.vcxproj
@@ -398,6 +398,7 @@
     <ClCompile Include="meta\bwav.c" />
     <ClCompile Include="meta\bw_mp3_riff.c" />
     <ClCompile Include="meta\caf.c" />
+    <ClCompile Include="meta\cbx.c" />
     <ClCompile Include="meta\ck.c" />
     <ClCompile Include="meta\compresswave.c" />
     <ClCompile Include="meta\cpk.c" />
@@ -474,7 +475,6 @@
     <ClCompile Include="meta\ima.c" />
     <ClCompile Include="meta\imc.c" />
     <ClCompile Include="meta\imuse.c" />
-    <ClCompile Include="meta\ios_psnd.c" />
     <ClCompile Include="meta\isb.c" />
     <ClCompile Include="meta\ish_isd.c" />
     <ClCompile Include="meta\ivag.c" />
@@ -596,6 +596,7 @@
     <ClCompile Include="meta\ps3_past.c" />
     <ClCompile Include="meta\psb.c" />
     <ClCompile Include="meta\psf.c" />
+    <ClCompile Include="meta\psnd.c" />
     <ClCompile Include="meta\ps_headerless.c" />
     <ClCompile Include="meta\pwb.c" />
     <ClCompile Include="meta\rad.c" />
diff --git a/src/libvgmstream.vcxproj.filters b/src/libvgmstream.vcxproj.filters
index 6cc23e0e..9e74b3d1 100644
--- a/src/libvgmstream.vcxproj.filters
+++ b/src/libvgmstream.vcxproj.filters
@@ -1015,6 +1015,9 @@
     <ClCompile Include="meta\caf.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="meta\cbx.c">
+      <Filter>meta\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="meta\ck.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
@@ -1243,9 +1246,6 @@
     <ClCompile Include="meta\imuse.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta\ios_psnd.c">
-      <Filter>meta\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="meta\isb.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
@@ -1609,6 +1609,9 @@
     <ClCompile Include="meta\psf.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="meta\psnd.c">
+      <Filter>meta\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="meta\ps_headerless.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
diff --git a/src/meta/ios_psnd.c b/src/meta/psnd.c
similarity index 100%
rename from src/meta/ios_psnd.c
rename to src/meta/psnd.c