From e989cb7ace48435ef1de1ea10f8e81c61a8a46e2 Mon Sep 17 00:00:00 2001 From: engineer124 <47598039+engineer124@users.noreply.github.com> Date: Sat, 4 Jun 2022 05:59:02 +1000 Subject: Audio Misc Docs and Cleanup (#1221) * Audio Cleanup * more * missed one * Audio docs imported from MM * Suggestions from Discord * Small fix * Fix sizes in z64audio.h * numSamples * Cleanup comments * Revert overlap with soundFont PR * revert Audio_AdsrUpdate cleanup (move to different PR) * PR Suggestion * Mainly typos * PR suggestion, vol -> volume * Better description * Name sampling frequency * A good number of PR suggestions * Missed a suggestion * More PR Suggestions Co-authored-by: fig02 --- src/code/code_800EC960.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/code/code_800EC960.c') diff --git a/src/code/code_800EC960.c b/src/code/code_800EC960.c index 523af6200..72bdd600d 100644 --- a/src/code/code_800EC960.c +++ b/src/code/code_800EC960.c @@ -2873,8 +2873,8 @@ void AudioDebug_Draw(GfxPrint* printer) { GfxPrint_SetPos(printer, 3, 5); GfxPrint_Printf(printer, "DRIVER %05X / %05X", - gAudioContext.notesAndBuffersPool.cur - gAudioContext.notesAndBuffersPool.start, - gAudioContext.notesAndBuffersPool.size); + gAudioContext.miscPool.curRamAddr - gAudioContext.miscPool.startRamAddr, + gAudioContext.miscPool.size); GfxPrint_SetPos(printer, 3, 6); GfxPrint_Printf( @@ -2890,7 +2890,8 @@ void AudioDebug_Draw(GfxPrint* printer) { GfxPrint_SetPos(printer, 3, 8); GfxPrint_Printf(printer, "ST-SEQ %02Xseqs (%05X / %06X)", gAudioContext.seqCache.persistent.numEntries, - gAudioContext.seqCache.persistent.pool.cur - gAudioContext.seqCache.persistent.pool.start, + gAudioContext.seqCache.persistent.pool.curRamAddr - + gAudioContext.seqCache.persistent.pool.startRamAddr, gAudioContext.seqCache.persistent.pool.size); for (k = 0; (u32)k < gAudioContext.seqCache.persistent.numEntries; k++) { @@ -2900,7 +2901,8 @@ void AudioDebug_Draw(GfxPrint* printer) { GfxPrint_SetPos(printer, 3, 10); GfxPrint_Printf(printer, "ST-BNK %02Xbanks (%05X / %06X)", gAudioContext.fontCache.persistent.numEntries, - gAudioContext.fontCache.persistent.pool.cur - gAudioContext.fontCache.persistent.pool.start, + gAudioContext.fontCache.persistent.pool.curRamAddr - + gAudioContext.fontCache.persistent.pool.startRamAddr, gAudioContext.fontCache.persistent.pool.size); for (k = 0; (u32)k < gAudioContext.fontCache.persistent.numEntries; k++) { @@ -2910,7 +2912,7 @@ void AudioDebug_Draw(GfxPrint* printer) { GfxPrint_SetPos(printer, 3, 12); GfxPrint_Printf(printer, "E-MEM %05X / %05X", - gAudioContext.permanentPool.cur - gAudioContext.permanentPool.start, + gAudioContext.permanentPool.curRamAddr - gAudioContext.permanentPool.startRamAddr, gAudioContext.permanentPool.size); break; -- cgit v1.2.3