MGislv/ooot
1
0
Fork 0
mirror of https://github.com/blawar/ooot.git synced 2024-06-25 22:09:34 +00:00
Code Releases Wiki Activity

fixed audio crash

Browse Source
This commit is contained in:
Blake Warner 2022-02-14 09:01:12 -05:00
parent 33bc628d9a
commit 4ce1221e81
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/def/audio_init_params.h
View File

@ -4,6 +4,6 @@ struct AudioContext;
struct AudioSpec;
extern const s16 D_8014A6C0[];
extern const AudioContextInitSizes D_8014A6C4;
extern AudioContextInitSizes D_8014A6C4;
extern AudioContext gAudioContext;
extern AudioSpec gAudioSpecs[18];

1
include/z64audio.h
View File

@ -1206,7 +1206,6 @@ extern u8 D_80133418;
extern const AudioContextInitSizes D_8014A6C4;
extern s16 gOcarinaSongItemMap[];
extern AudioTableDef gSoundFontTable;
extern u16 gSequenceFontTable[];

4
src/code/audio_init_params.cpp
View File

@ -13,7 +13,7 @@ const s16 D_8014A6C0[] = {
0x0030, // gTatumsPerBeat
};
const AudioContextInitSizes D_8014A6C4 = { 0x37F00, 0xE0E0, 0xBCE0 };
AudioContextInitSizes D_8014A6C4 = { 0x37F00, 0xE0E0, 0xBCE0 };
ReverbSettings D_80133420[][3] = {
{
@ -88,4 +88,4 @@ AudioSpec gAudioSpecs[18] = {
{ 32000, 1, 16, 4, 0, 0, 2, D_80133420[0], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x3800, 0x2880, 0, 0, 0 },
{ 22050, 1, 24, 4, 0, 0, 2, D_80133420[0], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x3800, 0x2880, 0, 0, 0 },
{ 32000, 1, 24, 4, 0, 0, 2, D_80133420[2], 0x300, 0x200, 0x7FFF, 0x7F0, 0xE00, 0, 0x3600, 0x2600, 0, 0, 0 },
};
};

3
src/code/audio_load.cpp
View File

@ -1213,8 +1213,7 @@ void AudioLoad_Init(void* heap, u32 heapSize) {
}
if (temp_v0_3 = AudioHeap_Alloc(&gAudioContext.audioInitPool, D_8014A6C4.permanentPoolSize), temp_v0_3 == NULL) {
// cast away const from D_8014A6C4
*((u32*)&D_8014A6C4.permanentPoolSize) = 0;
D_8014A6C4.permanentPoolSize = 0;
}
AudioHeap_AllocPoolInit(&gAudioContext.permanentPool, temp_v0_3, D_8014A6C4.permanentPoolSize);