diff options
| author | zelda2774 <69368340+zelda2774@users.noreply.github.com> | 2021-11-07 17:58:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-07 17:58:50 +0100 |
| commit | 5ad7cf9dbb90c1609d772d57f2f171828b4bf171 (patch) | |
| tree | 04cb568258723848ede1da11ddad6547c523c936 /src/code/code_800E4FE0.c | |
| parent | 823a3c07543c2c84fa2100ea2fcf4fda0f61f52f (diff) | |
Document parts of audio (#1000)
* Minor labelling
* progress
* play percentage -> delay
* duration -> gatetime
* more
* more
* more
* seqIdx -> playerIdx
* more
* more
* more
* more
* format
* fix comment
* filters
* more
* media
* confusion
* Sync load is actually slow load
* AudioHeap prefix
* more
* more
* reformat
* more
* more
* AudioLoad
* more
* more
* seq banks
* more consistent
* more
* name last function in audio_load
* More audio_synthesis
* clean up audio tables
* minor
* slow/fast load ramAddr
* format
* remove unused
* Remove union
* remove padding
* audio bank -> sound font
* seqLayer -> layer
* stuff
* seqChannel -> channel
* ChannelLayer -> Layer
* remove define, add bug comment
* format
* more
* cache enum
* more
* AudioSeq function prefix
* naming
* bankIdx -> bankId
* more
* format
* review
* more
* fixes
* avoid hardcoded sfxid's
* SE -> Sfx
Co-authored-by: zelda2774 <zelda2774@invalid>
Diffstat (limited to 'src/code/code_800E4FE0.c')
| -rw-r--r-- | src/code/code_800E4FE0.c | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/src/code/code_800E4FE0.c b/src/code/code_800E4FE0.c index 6371bf2bb..102012fa7 100644 --- a/src/code/code_800E4FE0.c +++ b/src/code/code_800E4FE0.c @@ -107,12 +107,12 @@ AudioTask* func_800E5000(void) { } gAudioContext.curAudioFrameDmaCount = 0; - func_800E11F0(); - Audio_ProcessLoads(gAudioContext.resetStatus); - func_800E4F58(); + AudioLoad_DecreaseSampleDmaTtls(); + AudioLoad_ProcessLoads(gAudioContext.resetStatus); + AudioLoad_ProcessScriptLoads(); if (gAudioContext.resetStatus != 0) { - if (Audio_ResetStep() == 0) { + if (AudioHeap_ResetStep() == 0) { if (gAudioContext.resetStatus == 0) { osSendMesg(gAudioContext.audioResetQueueP, gAudioContext.audioResetSpecIdToLoad, OS_MESG_NOBLOCK); } @@ -217,19 +217,19 @@ void func_800E5584(AudioCmd* cmd) { switch (cmd->op) { case 0x81: - func_800E1C18(cmd->arg1, cmd->arg2); + AudioLoad_SyncLoadSeqParts(cmd->arg1, cmd->arg2); return; case 0x82: - func_800E20D4(cmd->arg0, cmd->arg1, cmd->arg2); + AudioLoad_SyncInitSeqPlayer(cmd->arg0, cmd->arg1, cmd->arg2); func_800E59AC(cmd->arg0, cmd->data); return; case 0x85: - func_800E2124(cmd->arg0, cmd->arg1, cmd->data); + AudioLoad_SyncInitSeqPlayerSkipTicks(cmd->arg0, cmd->arg1, cmd->data); return; case 0x83: if (gAudioContext.seqPlayers[cmd->arg0].enabled) { if (cmd->asInt == 0) { - Audio_SequencePlayerDisableAsFinished(&gAudioContext.seqPlayers[cmd->arg0]); + AudioSeq_SequencePlayerDisableAsFinished(&gAudioContext.seqPlayers[cmd->arg0]); } else { func_800E5958(cmd->arg0, cmd->asInt); } @@ -247,12 +247,12 @@ void func_800E5584(AudioCmd* cmd) { return; case 0xF2: if (cmd->asUInt == 1) { - for (i = 0; i < gAudioContext.maxSimultaneousNotes; i++) { + for (i = 0; i < gAudioContext.numNotes; i++) { Note* note = &gAudioContext.notes[i]; NoteSubEu* subEu = ¬e->noteSubEu; - if (subEu->bitField0.s.enabled && note->playbackState.unk_04 == 0) { - if (note->playbackState.parentLayer->seqChannel->muteBehavior & 8) { - subEu->bitField0.s.finished = 1; + if (subEu->bitField0.enabled && note->playbackState.unk_04 == 0) { + if (note->playbackState.parentLayer->channel->muteBehavior & 8) { + subEu->bitField0.finished = 1; } } } @@ -266,19 +266,19 @@ void func_800E5584(AudioCmd* cmd) { return; case 0xF3: - func_800E1D64(cmd->arg0, cmd->arg1, cmd->arg2); + AudioLoad_SyncLoadInstrument(cmd->arg0, cmd->arg1, cmd->arg2); return; case 0xF4: - Audio_AudioTableAsyncLoad(cmd->arg0, cmd->arg1, cmd->arg2, &gAudioContext.unk_1E20); + AudioLoad_AsyncLoadSampleBank(cmd->arg0, cmd->arg1, cmd->arg2, &gAudioContext.externalLoadQueue); return; case 0xF5: - Audio_AudioBankAsyncLoad(cmd->arg0, cmd->arg1, cmd->arg2, &gAudioContext.unk_1E20); + AudioLoad_AsyncLoadFont(cmd->arg0, cmd->arg1, cmd->arg2, &gAudioContext.externalLoadQueue); return; case 0xFC: - Audio_AudioSeqAsyncLoad(cmd->arg0, cmd->arg1, cmd->arg2, &gAudioContext.unk_1E20); + AudioLoad_AsyncLoadSeq(cmd->arg0, cmd->arg1, cmd->arg2, &gAudioContext.externalLoadQueue); return; case 0xF6: - func_800E1F7C(cmd->arg1); + AudioLoad_DiscardSeqFonts(cmd->arg1); return; case 0x90: gAudioContext.unk_5BDC[cmd->arg0] = cmd->asUShort; @@ -293,7 +293,7 @@ void func_800E5584(AudioCmd* cmd) { case 0xE0: case 0xE1: case 0xE2: - func_800E7744(cmd->op - 0xE0, cmd->arg0, cmd->arg1, cmd->data); + Audio_SetFontInstrument(cmd->op - 0xE0, cmd->arg0, cmd->arg1, cmd->data); return; case 0xFE: temp_t7 = cmd->asUInt; @@ -301,14 +301,14 @@ void func_800E5584(AudioCmd* cmd) { for (i = 0; i < gAudioContext.audioBufferParameters.numSequencePlayers; i++) { SequencePlayer* seqPlayer = &gAudioContext.seqPlayers[i]; if (seqPlayer->enabled) { - Audio_SequencePlayerDisableAsFinished(seqPlayer); + AudioSeq_SequencePlayerDisableAsFinished(seqPlayer); } } } func_800E66C0(temp_t7); return; case 0xE3: - func_800DE4B0(cmd->asInt); + AudioHeap_PopCache(cmd->asInt); return; default: return; @@ -478,24 +478,24 @@ void Audio_ProcessCmds(u32 msg) { } } -u32 func_800E5E20(u32* arg0) { +u32 func_800E5E20(u32* out) { u32 sp1C; - if (osRecvMesg(&gAudioContext.unk_1E20, (OSMesg*)&sp1C, OS_MESG_NOBLOCK) == -1) { - *arg0 = 0; + if (osRecvMesg(&gAudioContext.externalLoadQueue, (OSMesg*)&sp1C, OS_MESG_NOBLOCK) == -1) { + *out = 0; return 0; } - *arg0 = sp1C & 0xFFFFFF; + *out = sp1C & 0xFFFFFF; return sp1C >> 0x18; } u8* func_800E5E84(s32 arg0, u32* arg1) { - return func_800E1F38(arg0, arg1); + return AudioLoad_GetFontsForSequence(arg0, arg1); } void func_800E5EA4(s32 arg0, u32* arg1, u32* arg2) { - *arg1 = gAudioContext.ctlEntries[arg0].unk_02; - *arg2 = gAudioContext.ctlEntries[arg0].unk_03; + *arg1 = gAudioContext.soundFonts[arg0].sampleBankId1; + *arg2 = gAudioContext.soundFonts[arg0].sampleBankId2; } s32 func_800E5EDC(void) { @@ -563,15 +563,15 @@ s8 func_800E6070(s32 playerIdx, s32 channelIdx, s32 scriptIdx) { } s8 func_800E60C4(s32 arg0, s32 arg1) { - return gAudioContext.seqPlayers[arg0].unk_158[arg1]; + return gAudioContext.seqPlayers[arg0].soundScriptIO[arg1]; } -void func_800E60EC(void* memAddr, u32 size) { - Audio_SoundAllocPoolInit(&gAudioContext.unkPool, memAddr, size); +void Audio_InitExternalPool(void* mem, u32 size) { + AudioHeap_AllocPoolInit(&gAudioContext.externalPool, mem, size); } -void func_800E611C(void) { - gAudioContext.unkPool.start = NULL; +void Audio_DestroyExternalPool(void) { + gAudioContext.externalPool.start = NULL; } void func_800E6128(SequencePlayer* seqPlayer, AudioCmd* cmd) { @@ -596,7 +596,7 @@ void func_800E6128(SequencePlayer* seqPlayer, AudioCmd* cmd) { seqPlayer->transposition = cmd->asSbyte; return; case 0x46: - seqPlayer->unk_158[cmd->arg2] = cmd->asSbyte; + seqPlayer->soundScriptIO[cmd->arg2] = cmd->asSbyte; return; case 0x4A: fadeVolume = (s32)cmd->arg1 / 127.0f; @@ -725,9 +725,9 @@ void Audio_WaitForAudioTask(void) { s32 func_800E6590(s32 arg0, s32 arg1, s32 arg2) { SequencePlayer* seqPlayer; - SequenceChannelLayer* layer; + SequenceLayer* layer; Note* note; - AudioBankSound* sound; + SoundFontSound* sound; s32 loopEnd; s32 samplePos; @@ -749,7 +749,7 @@ s32 func_800E6590(s32 arg0, s32 arg1, s32 arg2) { note = layer->note; if (layer == note->playbackState.parentLayer) { - sound = note->noteSubEu.sound.audioBankSound; + sound = note->noteSubEu.sound.soundFontSound; if (sound == NULL) { return 0; } @@ -777,21 +777,21 @@ s32 func_800E66C0(s32 arg0) { NoteSubEu* temp_a3; s32 i; Note* note; - AudioBankSound* sound; + SoundFontSound* sound; phi_v1 = 0; - for (i = 0; i < gAudioContext.maxSimultaneousNotes; i++) { + for (i = 0; i < gAudioContext.numNotes; i++) { note = &gAudioContext.notes[i]; temp_a2 = ¬e->playbackState; - if (note->noteSubEu.bitField0.s.enabled) { + if (note->noteSubEu.bitField0.enabled) { temp_a3 = ¬e->noteSubEu; if (temp_a2->adsr.action.s.state != 0) { if (arg0 >= 2) { - sound = temp_a3->sound.audioBankSound; - if (sound == NULL || temp_a3->bitField1.s.isSyntheticWave) { + sound = temp_a3->sound.soundFontSound; + if (sound == NULL || temp_a3->bitField1.isSyntheticWave) { continue; } - if (sound->sample->medium == 0) { + if (sound->sample->medium == MEDIUM_RAM) { continue; } } |
