From 66f36b5ad8eb88b22802caefbd5eb49265c8f7f1 Mon Sep 17 00:00:00 2001
From: bnnm <bananaman255@gmail.com>
Date: Sat, 29 Oct 2022 17:59:29 +0200
Subject: [PATCH] cleanup

---
 src/formats.c                        | 2 +-
 src/libvgmstream.vcxproj             | 2 +-
 src/libvgmstream.vcxproj.filters     | 2 +-
 src/meta/meta.h                      | 2 +-
 src/meta/{sqex_scd_sscf.c => sscf.c} | 4 ++--
 src/meta/sscf_encrypted.h            | 4 ++--
 src/vgmstream.c                      | 2 +-
 src/vgmstream.h                      | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)
 rename src/meta/{sqex_scd_sscf.c => sscf.c} (97%)

diff --git a/src/formats.c b/src/formats.c
index 37993b78..b0de59da 100644
--- a/src/formats.c
+++ b/src/formats.c
@@ -1318,7 +1318,7 @@ static const meta_info meta_info_list[] = {
         {meta_WAVEBATCH,            "Firebrand Games WBAT header"},
         {meta_HD3_BD3,              "Sony HD3+BD3 header"},
         {meta_BNK_SONY,             "Sony BNK header"},
-        {meta_SCD_SSCF,             "Square-Enix SCD (SSCF) header"},
+        {meta_SSCF,                 "Square-Enix SSCF header"},
         {meta_DSP_VAG,              ".VAG DSP header"},
         {meta_DSP_ITL,              ".ITL DSP header"},
         {meta_A2M,                  "Artificial Mind & Movement A2M header"},
diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj
index 8e284369..bd866fdd 100644
--- a/src/libvgmstream.vcxproj
+++ b/src/libvgmstream.vcxproj
@@ -268,7 +268,7 @@
     <ClCompile Include="meta\seg.c" />
     <ClCompile Include="meta\sfh.c" />
     <ClCompile Include="meta\sqex_scd.c" />
-    <ClCompile Include="meta\sqex_scd_sscf.c" />
+    <ClCompile Include="meta\sqex_sscf.c" />
     <ClCompile Include="meta\sqex_sead.c" />
     <ClCompile Include="meta\sscf_encrypted.c" />
     <ClCompile Include="meta\sspr.c" />
diff --git a/src/libvgmstream.vcxproj.filters b/src/libvgmstream.vcxproj.filters
index 5b3767c3..be205087 100644
--- a/src/libvgmstream.vcxproj.filters
+++ b/src/libvgmstream.vcxproj.filters
@@ -1699,7 +1699,7 @@
     <ClCompile Include="meta\sqex_scd.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta\sqex_scd_sscf.c">
+    <ClCompile Include="meta\sscf.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="meta\sqex_sead.c">
diff --git a/src/meta/meta.h b/src/meta/meta.h
index 8c7f456a..8f2c2706 100644
--- a/src/meta/meta.h
+++ b/src/meta/meta.h
@@ -757,7 +757,7 @@ VGMSTREAM * init_vgmstream_bnk_sony(STREAMFILE *streamFile);
 VGMSTREAM * init_vgmstream_nus3bank(STREAMFILE *streamFile);
 VGMSTREAM * init_vgmstream_nus3bank_encrypted(STREAMFILE *streamFile);
 
-VGMSTREAM * init_vgmstream_scd_sscf(STREAMFILE *streamFile);
+VGMSTREAM * init_vgmstream_sscf(STREAMFILE *streamFile);
 
 VGMSTREAM * init_vgmstream_a2m(STREAMFILE *streamFile);
 
diff --git a/src/meta/sqex_scd_sscf.c b/src/meta/sscf.c
similarity index 97%
rename from src/meta/sqex_scd_sscf.c
rename to src/meta/sscf.c
index 58c2559b..ce1ef2d4 100644
--- a/src/meta/sqex_scd_sscf.c
+++ b/src/meta/sscf.c
@@ -2,7 +2,7 @@
 #include "../coding/coding.h"
 
 /* SSCF - Square-Enix games, older version of .scd [Crisis Core -Final Fantasy VII- (PSP), Dissidia 012 (PSP)] */
-VGMSTREAM* init_vgmstream_scd_sscf(STREAMFILE* sf) {
+VGMSTREAM* init_vgmstream_sscf(STREAMFILE* sf) {
     VGMSTREAM* vgmstream = NULL;
     uint32_t start_offset, meta_offset, stream_offset, stream_size;
     int loop_flag, channels, sample_rate;
@@ -100,7 +100,7 @@ VGMSTREAM* init_vgmstream_scd_sscf(STREAMFILE* sf) {
         vgmstream->loop_end_sample = vgmstream->num_samples;
     }
 
-    vgmstream->meta_type = meta_SCD_SSCF;
+    vgmstream->meta_type = meta_SSCF;
     vgmstream->coding_type = coding_PSX;
     vgmstream->layout_type = layout_none;
 
diff --git a/src/meta/sscf_encrypted.h b/src/meta/sscf_encrypted.h
index 8401fb45..c9e7e723 100644
--- a/src/meta/sscf_encrypted.h
+++ b/src/meta/sscf_encrypted.h
@@ -1,5 +1,5 @@
-#ifndef _SQEX_SCD_SSCF_ENCRYPTED_H_
-#define _SQEX_SCD_SSCF_ENCRYPTED_H_
+#ifndef _SSCF_ENCRYPTED_H_
+#define _SSCF_ENCRYPTED_H_
 #include "../streamfile.h"
 
 typedef struct {
diff --git a/src/vgmstream.c b/src/vgmstream.c
index e8fbe33d..3121e0a4 100644
--- a/src/vgmstream.c
+++ b/src/vgmstream.c
@@ -384,7 +384,7 @@ VGMSTREAM* (*init_vgmstream_functions[])(STREAMFILE* sf) = {
     init_vgmstream_bnk_sony,
     init_vgmstream_nus3bank,
     init_vgmstream_nus3bank_encrypted,
-    init_vgmstream_scd_sscf,
+    init_vgmstream_sscf,
     init_vgmstream_dsp_sps_n1,
     init_vgmstream_dsp_itl_ch,
     init_vgmstream_a2m,
diff --git a/src/vgmstream.h b/src/vgmstream.h
index 91925e19..54d93aaf 100644
--- a/src/vgmstream.h
+++ b/src/vgmstream.h
@@ -665,7 +665,7 @@ typedef enum {
     meta_WAVEBATCH,         /* Firebrand Games */
     meta_HD3_BD3,           /* Sony PS3 bank */
     meta_BNK_SONY,          /* Sony Scream Tool bank */
-    meta_SCD_SSCF,          /* Square Enix SCD old version */
+    meta_SSCF,
     meta_DSP_VAG,           /* Penny-Punching Princess (Switch) sfx */
     meta_DSP_ITL,           /* Charinko Hero (GC) */
     meta_A2M,               /* Scooby-Doo! Unmasked (PS2) */