print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: the smaller MAX_SIMULTANEOUS_NOTES define, when used, can lead to silence on audio init

Browse Source
This commit is contained in:
gheskett
2022-02-27 00:20:52 -05:00
parent f061076a4f
commit c4a23d0036
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/audio/heap.c
View File

@@ -1313,6 +1313,16 @@ void audio_reset_session(void) {
gAudioBufferParameters.minAiBufferLength *= gAudioBufferParameters.presetUnk4;
gAudioBufferParameters.updatesPerFrame *= gAudioBufferParameters.presetUnk4;
if (gIsConsole)
gMaxSimultaneousNotes = MAX_SIMULTANEOUS_NOTES_CONSOLE;
else
gMaxSimultaneousNotes = MAX_SIMULTANEOUS_NOTES_EMULATOR;
if (gMaxSimultaneousNotes > MAX_SIMULTANEOUS_NOTES)
gMaxSimultaneousNotes = MAX_SIMULTANEOUS_NOTES;
else if (gMaxSimultaneousNotes < 0)
gMaxSimultaneousNotes = 0;
#ifdef VERSION_SH
if (gAudioBufferParameters.presetUnk4 >= 2) {
gAudioBufferParameters.maxAiBufferLength -= 0x10;
@@ -1330,6 +1340,16 @@ void audio_reset_session(void) {
gMinAiBufferLength = gSamplesPerFrameTarget - 0x10;
gAudioUpdatesPerFrame = updatesPerFrame = gSamplesPerFrameTarget / 160 + 1;
if (gIsConsole)
gMaxSimultaneousNotes = MAX_SIMULTANEOUS_NOTES_CONSOLE;
else
gMaxSimultaneousNotes = MAX_SIMULTANEOUS_NOTES_EMULATOR;
if (gMaxSimultaneousNotes > MAX_SIMULTANEOUS_NOTES)
gMaxSimultaneousNotes = MAX_SIMULTANEOUS_NOTES;
else if (gMaxSimultaneousNotes < 0)
gMaxSimultaneousNotes = 0;
// Compute conversion ratio from the internal unit tatums/tick to the
// external beats/minute (JP) or tatums/minute (US). In practice this is
// 300 on JP and 14360 on US.
@@ -1426,16 +1446,6 @@ void audio_reset_session(void) {
#endif
#endif
if (gIsConsole)
gMaxSimultaneousNotes = MAX_SIMULTANEOUS_NOTES_CONSOLE;
else
gMaxSimultaneousNotes = MAX_SIMULTANEOUS_NOTES_EMULATOR;
if (gMaxSimultaneousNotes > MAX_SIMULTANEOUS_NOTES)
gMaxSimultaneousNotes = MAX_SIMULTANEOUS_NOTES;
else if (gMaxSimultaneousNotes < 0)
gMaxSimultaneousNotes = 0;
sAudioFirstBoot = 1;
}