From fe66304d6ff7b919ff5f3f3124aa99d28dca2fd7 Mon Sep 17 00:00:00 2001
From: jaby <jaby@william.zone>
Date: Wed, 29 May 2024 18:36:46 +0200
Subject: [PATCH] Integrate a second CDXA song

---
 examples/PoolBox/application/src/asset_mgr.cpp | 2 +-
 examples/PoolBox/assets/Makefile               | 6 +++++-
 examples/PoolBox/iso/Config.xml                | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/examples/PoolBox/application/src/asset_mgr.cpp b/examples/PoolBox/application/src/asset_mgr.cpp
index a2efde13..e9e62d30 100644
--- a/examples/PoolBox/application/src/asset_mgr.cpp
+++ b/examples/PoolBox/application/src/asset_mgr.cpp
@@ -111,7 +111,7 @@ namespace Assets {
 
     namespace XAAudio {
         void play_fox() {
-            CDXA::play(lba, CDXA::CDFile{FOX_XA}, 0);
+            CDXA::play(lba, FOX_XA, 0, false);
         }
     }
 }
\ No newline at end of file
diff --git a/examples/PoolBox/assets/Makefile b/examples/PoolBox/assets/Makefile
index b0fac76b..0d1cd2c0 100644
--- a/examples/PoolBox/assets/Makefile
+++ b/examples/PoolBox/assets/Makefile
@@ -2,12 +2,16 @@ include $(JABY_ENGINE_DIR)/mkfile/common/ExportPath.mk
 include $(JABY_ENGINE_DIR)/mkfile/common/RebuildTarget.mk
 
 OUTPUT_DIR = bin
-INPUT      = $(OUTPUT_DIR)/fox.xa $(OUTPUT_DIR)/TexturePage.bin $(OUTPUT_DIR)/IconTexture.bin $(OUTPUT_DIR)/Paco.bin $(OUTPUT_DIR)/Controller.bin $(OUTPUT_DIR)/doener_fish.bin $(OUTPUT_DIR)/JabyStar.bin
+INPUT      = $(OUTPUT_DIR)/Evacuation.xa $(OUTPUT_DIR)/fox.xa $(OUTPUT_DIR)/TexturePage.bin $(OUTPUT_DIR)/IconTexture.bin $(OUTPUT_DIR)/Paco.bin $(OUTPUT_DIR)/Controller.bin $(OUTPUT_DIR)/doener_fish.bin $(OUTPUT_DIR)/JabyStar.bin
 
 $(OUTPUT_DIR)/fox.xa: audio/temp/fox.wav
 	@mkdir -p $(OUTPUT_DIR)
 	jaby_engine_fconv $< -o $@ xa
 
+$(OUTPUT_DIR)/Evacuation.xa: audio/Evacuation_cdda.wav
+	@mkdir -p $(OUTPUT_DIR)
+	jaby_engine_fconv $< -o $@ xa
+
 # TODO: Simplyfy all of these?
 $(OUTPUT_DIR)/TexturePage.bin: TexturePage.png
 	@mkdir -p $(OUTPUT_DIR)
diff --git a/examples/PoolBox/iso/Config.xml b/examples/PoolBox/iso/Config.xml
index 25600aef..09e899a4 100644
--- a/examples/PoolBox/iso/Config.xml
+++ b/examples/PoolBox/iso/Config.xml
@@ -34,8 +34,8 @@
         <Directory name = "XAAUDIO" hidden = "true">
             <XA-Audio name = "FOX.XA">
                 <Channel>../assets/bin/fox.xa</Channel>
+                <Channel>../assets/bin/Evacuation.xa</Channel>
             </XA-Audio>
         </Directory>
     </Track>
-    <CD_Audio>../assets/audio/Evacuation_cdda.wav</CD_Audio>
 </ISO_Project>
\ No newline at end of file