summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSonic Dreamcaster <alejandro.asenjo88@gmail.com>2025-03-21 15:45:57 -0300
committerSonic Dreamcaster <alejandro.asenjo88@gmail.com>2025-03-21 15:45:57 -0300
commit984e290d162372b5347daf3b1bcb13753a7c7877 (patch)
tree4d0e1862d4fe5fbb33928776356b14083893936e
parent2c64c819620ffae76a94e0741f7d40afe49fac31 (diff)
audio WIP
-rw-r--r--src/audio/audio_load.c5
-rw-r--r--src/audio/audio_playback.c1
-rw-r--r--src/port/resource/loaders/AudioLoader.cpp6
3 files changed, 11 insertions, 1 deletions
diff --git a/src/audio/audio_load.c b/src/audio/audio_load.c
index c5804b62..361f303a 100644
--- a/src/audio/audio_load.c
+++ b/src/audio/audio_load.c
@@ -418,6 +418,10 @@ void AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2) {
void* AudioLoad_SyncLoadSeq(s32 seqId) {
AudioTable* table = AudioLoad_GetLoadTable(SEQUENCE_TABLE);
+ char* seqPath = ResourceGetNameByCrc((uint64_t) table->entries[seqId].romAddr);
+ printf("seqId: %d\n", seqId);
+ printf("seqPath: %s\n", seqPath);
+
return ResourceGetDataByCrc((uint64_t) table->entries[seqId].romAddr);
}
@@ -612,6 +616,7 @@ void AudioLoad_RelocateFont(s32 fontId, uintptr_t fontBaseAddr, SampleBankRelocI
SoundFont* font = Audio_LoadFont(table->entries[fontId], fontId);
gSoundFontList[fontId] = *font;
+
}
void AudioLoad_SyncDma(uintptr_t devAddr, u8* ramAddr, u32 size, s32 medium) {
diff --git a/src/audio/audio_playback.c b/src/audio/audio_playback.c
index 80235d68..9e250ae3 100644
--- a/src/audio/audio_playback.c
+++ b/src/audio/audio_playback.c
@@ -214,6 +214,7 @@ Instrument* Audio_GetInstrument(s32 fontId, s32 instId) {
D_80155D88 = (fontId << 8) + instId + 0x01000000;
return instrument;
}
+ printf("InstId: %d\n", instId);
return instrument;
}
diff --git a/src/port/resource/loaders/AudioLoader.cpp b/src/port/resource/loaders/AudioLoader.cpp
index 156d067b..8965af9f 100644
--- a/src/port/resource/loaders/AudioLoader.cpp
+++ b/src/port/resource/loaders/AudioLoader.cpp
@@ -9,7 +9,11 @@
#ifdef OTR_AUDIO
extern "C" SoundFont* Audio_LoadFont(AudioTableEntry entry, uint32_t fontId) {
- return (SoundFont*) ResourceGetDataByCrc((uint64_t) gSoundFontTable->entries[fontId].romAddr);
+ auto crc = (uint64_t) gSoundFontTable->entries[fontId].romAddr;
+ auto path = ResourceGetNameByCrc(crc);
+ printf("Font: %s\n", path);
+
+ return (SoundFont*) ResourceGetDataByCrc(crc);
}
#else
namespace fs = std::filesystem;