From de1a8b497d5445384e27cad617e9223c1c5e8ae2 Mon Sep 17 00:00:00 2001
From: Jaby <fenir50@web.de>
Date: Sat, 28 Sep 2024 13:21:32 +0200
Subject: [PATCH] Offically support Sony VAG because we have no own conversion

---
 include/PSX/File/cd_file_types.hpp                   | 4 ----
 include/PSX/jabyengine_config.hpp                    | 2 --
 src/Library/src/File/Processor/cd_file_processor.cpp | 2 --
 src/Library/src/File/Processor/vag_processor.cpp     | 4 +---
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/include/PSX/File/cd_file_types.hpp b/include/PSX/File/cd_file_types.hpp
index df3feeae..a4f4025e 100644
--- a/include/PSX/File/cd_file_types.hpp
+++ b/include/PSX/File/cd_file_types.hpp
@@ -10,9 +10,7 @@ namespace JabyEngine {
     enum struct CDFileType : CDFileType_t {
         CopyTo = 0,
         SimpleTIM,
-    #ifdef __SUPPORT_VAG__
         SonyVAG,
-    #endif // __SUPPORT_VAG__
         Custom,
     };
 
@@ -51,11 +49,9 @@ namespace JabyEngine {
             return CDFile{.rel_lba_idx = rel_lba_idx, .type = CDFileType::SimpleTIM, .payload = {.simple_tim = simple_tim}};
         }
 
-#ifdef __SUPPORT_VAG__
         static constexpr CDFile sony_vag(uint8_t lba_idx, VAG vag) {
             return CDFile{.rel_lba_idx = lba_idx, .type = CDFileType::SonyVAG, .payload = {.vag = vag}};
         }
-#endif //__SUPPORT_VAG__
 
         static constexpr CDFile overlay(uint8_t rel_lba_idx, uint32_t* overlay_dst) {
             return CDFile{.rel_lba_idx = rel_lba_idx, .type = CDFileType::CopyTo, .payload = {.overlay = Overlay{overlay_dst}}};
diff --git a/include/PSX/jabyengine_config.hpp b/include/PSX/jabyengine_config.hpp
index 868a6052..3a92f80d 100644
--- a/include/PSX/jabyengine_config.hpp
+++ b/include/PSX/jabyengine_config.hpp
@@ -31,8 +31,6 @@ namespace JabyEngine {
         using Configuration = CustomConfiguration;
     #else
         using Configuration = DefaultConfiguration;
-        // TODO: v Turn off when this is supported
-        #define __SUPPORT_VAG__
         #define __SUPPORT_PS3__
     #endif // has jabyengine_custom_config
 }
\ No newline at end of file
diff --git a/src/Library/src/File/Processor/cd_file_processor.cpp b/src/Library/src/File/Processor/cd_file_processor.cpp
index 63ab8a88..a9db807f 100644
--- a/src/Library/src/File/Processor/cd_file_processor.cpp
+++ b/src/Library/src/File/Processor/cd_file_processor.cpp
@@ -43,10 +43,8 @@ namespace JabyEngine {
                     case CDFileType::SimpleTIM:
                         return FileProcessor::create(data_adr, file.payload.simple_tim);
 
-#ifdef __SUPPORT_VAG__
                     case CDFileType::SonyVAG:
                         return FileProcessor::create(data_adr, file.payload.vag);
-#endif //__SUPPORT_VAG__
 
                     default:
                         return FileProcessor::create_custom(data_adr, static_cast<CDFileType_t>(file.type) - static_cast<CDFileType_t>(CDFileType::Custom), file.payload);     
diff --git a/src/Library/src/File/Processor/vag_processor.cpp b/src/Library/src/File/Processor/vag_processor.cpp
index 3d256035..7ef5d5d6 100644
--- a/src/Library/src/File/Processor/vag_processor.cpp
+++ b/src/Library/src/File/Processor/vag_processor.cpp
@@ -5,7 +5,6 @@
 #include <PSX/SPU/spu.hpp>
 #include <stdio.hpp>
 
-#ifdef __SUPPORT_VAG__
 namespace JabyEngine {
     namespace FileProcessor {
         struct VAGHeader {
@@ -77,5 +76,4 @@ namespace JabyEngine {
             return State::from(VAGState::create(file.voice_number, file.inital_stereo_vol), data_adr, parse_header);
         }
     }
-}
-#endif // __SUPPORT_VAG__
\ No newline at end of file
+}
\ No newline at end of file