jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Integrate a second CDXA song

This commit is contained in:
jaby 2024-05-29 18:36:46 +02:00
parent 9edb3ee122
commit fe66304d6f
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/PoolBox/application/src/asset_mgr.cpp
View File

@ -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);
}
}
}

6
examples/PoolBox/assets/Makefile
View File

@ -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)

2
examples/PoolBox/iso/Config.xml
View File

@ -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>