From bf9cc7f63588b17c8a497b434d5063200361993b Mon Sep 17 00:00:00 2001
From: bnnm <bananaman255@gmail.com>
Date: Sun, 23 Jul 2023 11:06:14 +0200
Subject: [PATCH] cleanup: rename sxd to sndx

---
 src/formats.c                    | 2 +-
 src/libvgmstream.vcxproj         | 2 +-
 src/libvgmstream.vcxproj.filters | 6 +++---
 src/meta/meta.h                  | 2 +-
 src/meta/{sxd.c => sndx.c}       | 6 +++---
 src/vgmstream.c                  | 2 +-
 src/vgmstream_types.h            | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename src/meta/{sxd.c => sndx.c} (97%)

diff --git a/src/formats.c b/src/formats.c
index 72f94223..023b542e 100644
--- a/src/formats.c
+++ b/src/formats.c
@@ -1242,7 +1242,7 @@ static const meta_info meta_info_list[] = {
         {meta_ASTB,                 "Capcom ASTB header"},
         {meta_WWISE_RIFF,           "Audiokinetic Wwise RIFF header"},
         {meta_UBI_RAKI,             "Ubisoft RAKI header"},
-        {meta_SXD,                  "Sony SXD header"},
+        {meta_SNDX,                 "Sony SNDX header"},
         {meta_OGL,                  "Shin'en OGL header"},
         {meta_MC3,                  "Paradigm MC3 header"},
         {meta_GHS,                  "Hexadrive GHS/S_P_STH header"},
diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj
index 80c2dc9e..adcd81b0 100644
--- a/src/libvgmstream.vcxproj
+++ b/src/libvgmstream.vcxproj
@@ -628,6 +628,7 @@
     <ClCompile Include="meta\smp.c" />
     <ClCompile Include="meta\smpl.c" />
     <ClCompile Include="meta\smv.c" />
+    <ClCompile Include="meta\sndx.c" />
     <ClCompile Include="meta\sndz.c" />
     <ClCompile Include="meta\spm.c" />
     <ClCompile Include="meta\spsd.c" />
@@ -652,7 +653,6 @@
     <ClCompile Include="meta\svg.c" />
     <ClCompile Include="meta\svs.c" />
     <ClCompile Include="meta\swav.c" />
-    <ClCompile Include="meta\sxd.c" />
     <ClCompile Include="meta\tac.c" />
     <ClCompile Include="meta\tgc.c" />
     <ClCompile Include="meta\thp.c" />
diff --git a/src/libvgmstream.vcxproj.filters b/src/libvgmstream.vcxproj.filters
index dd7c7f13..e136f555 100644
--- a/src/libvgmstream.vcxproj.filters
+++ b/src/libvgmstream.vcxproj.filters
@@ -1705,6 +1705,9 @@
     <ClCompile Include="meta\smv.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="meta\sndx.c">
+      <Filter>meta\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="meta\sndz.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
@@ -1777,9 +1780,6 @@
     <ClCompile Include="meta\swav.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta\sxd.c">
-      <Filter>meta\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="meta\tac.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
diff --git a/src/meta/meta.h b/src/meta/meta.h
index e678c971..93d52d6e 100644
--- a/src/meta/meta.h
+++ b/src/meta/meta.h
@@ -574,7 +574,7 @@ VGMSTREAM * init_vgmstream_ubi_raki(STREAMFILE* streamFile);
 
 VGMSTREAM* init_vgmstream_pasx(STREAMFILE* sf);
 
-VGMSTREAM * init_vgmstream_sxd(STREAMFILE *streamFile);
+VGMSTREAM * init_vgmstream_sndx(STREAMFILE *streamFile);
 
 VGMSTREAM * init_vgmstream_ogl(STREAMFILE *streamFile);
 
diff --git a/src/meta/sxd.c b/src/meta/sndx.c
similarity index 97%
rename from src/meta/sxd.c
rename to src/meta/sndx.c
index 4cbd97fc..798990cd 100644
--- a/src/meta/sxd.c
+++ b/src/meta/sndx.c
@@ -3,8 +3,8 @@
 #include "../util/chunks.h"
 
 
-/* SXD - Sony/SCE's SNDX lib format (cousin of SGXD) [Gravity Rush, Freedom Wars, Soul Sacrifice PSV] */
-VGMSTREAM* init_vgmstream_sxd(STREAMFILE* sf) {
+/* SXDF/SXDS - Sony/SCE's SNDX lib format (cousin of SGXD) [Gravity Rush, Freedom Wars, Soul Sacrifice PSV] */
+VGMSTREAM* init_vgmstream_sndx(STREAMFILE* sf) {
     VGMSTREAM* vgmstream = NULL;
     STREAMFILE* sf_sxd1 = NULL, *sf_sxd2 = NULL, *sf_data = NULL, *sf_h = NULL, *sf_b = NULL;
     off_t start_offset, chunk_offset, first_offset = 0x60, name_offset = 0;
@@ -180,7 +180,7 @@ VGMSTREAM* init_vgmstream_sxd(STREAMFILE* sf) {
     vgmstream = allocate_vgmstream(channels, loop_flag);
     if (!vgmstream) goto fail;
 
-    vgmstream->meta_type = meta_SXD;
+    vgmstream->meta_type = meta_SNDX;
     vgmstream->sample_rate = sample_rate;
 
     vgmstream->num_samples = num_samples;
diff --git a/src/vgmstream.c b/src/vgmstream.c
index 85729a9d..6f7444b4 100644
--- a/src/vgmstream.c
+++ b/src/vgmstream.c
@@ -283,7 +283,7 @@ init_vgmstream_t init_vgmstream_functions[] = {
     init_vgmstream_ubi_raki,
     init_vgmstream_pasx,
     init_vgmstream_xma,
-    init_vgmstream_sxd,
+    init_vgmstream_sndx,
     init_vgmstream_ogl,
     init_vgmstream_mc3,
     init_vgmstream_ghs,
diff --git a/src/vgmstream_types.h b/src/vgmstream_types.h
index fed12908..e25e0ad6 100644
--- a/src/vgmstream_types.h
+++ b/src/vgmstream_types.h
@@ -529,7 +529,7 @@ typedef enum {
     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_SNDX,
     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_GHS,
@@ -537,7 +537,7 @@ typedef enum {
     meta_MTA2,
     meta_XA_XA30,
     meta_XA_04SW,
-    meta_TXTH,              /* generic text header */
+    meta_TXTH,
     meta_SK_AUD,            /* Silicon Knights .AUD (Eternal Darkness GC) */
     meta_AHX,
     meta_STMA,