mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-09-21 04:24:43 +00:00
Code Issues Projects Releases Wiki Activity

Introduce Mutebehavior Flags (#1304)

Browse Source 
* Add muteBehavior flags

* touchup

* Adjust comment
This commit is contained in:
engineer124 2022-07-04 12:00:29 -04:00 committed by GitHub
parent f2d4c3b10b
commit 8778bf09b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/z64audio.h
View File

@ -12,6 +12,12 @@
#define MAX_CHANNELS_PER_BANK 3 #define MAX_CHANNELS_PER_BANK 3
#define MUTE_BEHAVIOR_3 (1 << 3) // prevent further noteSubEus from playing
#define MUTE_BEHAVIOR_4 (1 << 4) // stop something in seqLayer scripts
#define MUTE_BEHAVIOR_SOFTEN (1 << 5) // lower volume, by default to half
#define MUTE_BEHAVIOR_STOP_NOTES (1 << 6) // prevent further notes from playing
#define MUTE_BEHAVIOR_STOP_SCRIPT (1 << 7) // stop processing sequence/channel scripts
#define ADSR_DISABLE 0 #define ADSR_DISABLE 0
#define ADSR_HANG -1 #define ADSR_HANG -1
#define ADSR_GOTO -2 #define ADSR_GOTO -2

2
src/code/audio_effects.c
View File

@ -8,7 +8,7 @@ void Audio_SequenceChannelProcessSound(SequenceChannel* channel, s32 recalculate
if (channel->changes.s.volume || recalculateVolume) { if (channel->changes.s.volume || recalculateVolume) {
channelVolume = channel->volume * channel->volumeScale * channel->seqPlayer->appliedFadeVolume; channelVolume = channel->volume * channel->volumeScale * channel->seqPlayer->appliedFadeVolume;
if (channel->seqPlayer->muted && (channel->muteBehavior & 0x20)) { if (channel->seqPlayer->muted && (channel->muteBehavior & MUTE_BEHAVIOR_SOFTEN)) {
channelVolume = channel->seqPlayer->muteVolumeScale * channelVolume; channelVolume = channel->seqPlayer->muteVolumeScale * channelVolume;
} }
channel->appliedVolume = channelVolume * channelVolume; channel->appliedVolume = channelVolume * channelVolume;

6
src/code/audio_playback.c
View File

@ -186,7 +186,7 @@ void Audio_ProcessNotes(void) {
playbackState->unk_04 = 1; playbackState->unk_04 = 1;
continue; continue;
} else if (playbackState->parentLayer->channel->seqPlayer->muted && } else if (playbackState->parentLayer->channel->seqPlayer->muted &&
(playbackState->parentLayer->channel->muteBehavior & 0x40)) { (playbackState->parentLayer->channel->muteBehavior & MUTE_BEHAVIOR_STOP_NOTES)) {
// do nothing // do nothing
} else { } else {
goto out; goto out;
@ -277,7 +277,7 @@ void Audio_ProcessNotes(void) {
subAttrs.unk_16 = channel->unk_20; subAttrs.unk_16 = channel->unk_20;
bookOffset = channel->bookOffset & 0x7; bookOffset = channel->bookOffset & 0x7;
if (channel->seqPlayer->muted && (channel->muteBehavior & 8)) { if (channel->seqPlayer->muted && (channel->muteBehavior & MUTE_BEHAVIOR_3)) {
subAttrs.frequency = 0.0f; subAttrs.frequency = 0.0f;
subAttrs.velocity = 0.0f; subAttrs.velocity = 0.0f;
} }
@ -481,7 +481,7 @@ void Audio_SeqLayerDecayRelease(SequenceLayer* layer, s32 target) {
attrs->unk_6 = chan->unk_20; attrs->unk_6 = chan->unk_20;
attrs->unk_4 = chan->unk_0F; attrs->unk_4 = chan->unk_0F;
if (chan->seqPlayer->muted && (chan->muteBehavior & 8)) { if (chan->seqPlayer->muted && (chan->muteBehavior & MUTE_BEHAVIOR_3)) {
note->noteSubEu.bitField0.finished = true; note->noteSubEu.bitField0.finished = true;
} }

9
src/code/audio_seqplayer.c
View File

@ -1077,7 +1077,8 @@ s32 AudioSeq_SeqLayerProcessScriptStep3(SequenceLayer* layer, s32 cmd) {
} }
} }
if ((seqPlayer->muted && (channel->muteBehavior & (0x40 | 0x10)) != 0) || channel->stopSomething2) { if ((seqPlayer->muted && (channel->muteBehavior & (MUTE_BEHAVIOR_STOP_NOTES | MUTE_BEHAVIOR_4))) ||
channel->stopSomething2) {
layer->stopSomething = true; layer->stopSomething = true;
return PROCESS_SCRIPT_END; return PROCESS_SCRIPT_END;
} }
@ -1160,7 +1161,7 @@ void AudioSeq_SequenceChannelProcessScript(SequenceChannel* channel) {
} }
seqPlayer = channel->seqPlayer; seqPlayer = channel->seqPlayer;
if (seqPlayer->muted && (channel->muteBehavior & 0x80)) { if (seqPlayer->muted && (channel->muteBehavior & MUTE_BEHAVIOR_STOP_SCRIPT)) {
return; return;
} }
@ -1737,7 +1738,7 @@ void AudioSeq_SequencePlayerProcessSequence(SequencePlayer* seqPlayer) {
AudioLoad_SetSeqLoadStatus(seqPlayer->seqId, LOAD_STATUS_COMPLETE); AudioLoad_SetSeqLoadStatus(seqPlayer->seqId, LOAD_STATUS_COMPLETE);
AudioLoad_SetFontLoadStatus(seqPlayer->defaultFont, LOAD_STATUS_COMPLETE); AudioLoad_SetFontLoadStatus(seqPlayer->defaultFont, LOAD_STATUS_COMPLETE);
if (seqPlayer->muted && (seqPlayer->muteBehavior & 0x80)) { if (seqPlayer->muted && (seqPlayer->muteBehavior & MUTE_BEHAVIOR_STOP_SCRIPT)) {
return; return;
} }
@ -2126,7 +2127,7 @@ void AudioSeq_InitSequencePlayer(SequencePlayer* seqPlayer) {
seqPlayer->soundScriptIO[j] = -1; seqPlayer->soundScriptIO[j] = -1;
} }
seqPlayer->muteBehavior = 0x40 | 0x20; seqPlayer->muteBehavior = MUTE_BEHAVIOR_SOFTEN | MUTE_BEHAVIOR_STOP_NOTES;
seqPlayer->fadeVolumeScale = 1.0f; seqPlayer->fadeVolumeScale = 1.0f;
seqPlayer->bend = 1.0f; seqPlayer->bend = 1.0f;
Audio_InitNoteLists(&seqPlayer->notePool); Audio_InitNoteLists(&seqPlayer->notePool);

4
src/code/code_800E4FE0.c
View File

@ -264,8 +264,8 @@ void func_800E5584(AudioCmd* cmd) {
NoteSubEu* subEu = &note->noteSubEu; NoteSubEu* subEu = &note->noteSubEu;
if (subEu->bitField0.enabled && note->playbackState.unk_04 == 0) { if (subEu->bitField0.enabled && note->playbackState.unk_04 == 0) {
if (note->playbackState.parentLayer->channel->muteBehavior & 8) { if (note->playbackState.parentLayer->channel->muteBehavior & MUTE_BEHAVIOR_3) {
subEu->bitField0.finished = 1; subEu->bitField0.finished = true;
} }
} }
} }