mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-11 12:05:09 -05:00
Code Issues Projects Releases Wiki Activity

Increased initial audio pool size and fixed types

Browse Source
This commit is contained in:
Kevin Alexis Contreras 2022-06-03 14:22:48 -05:00
parent d42c0ca23f
commit e0ff6311ef
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
soh/src/code/audio_heap.c
View File

@ -1150,9 +1150,9 @@ void AudioHeap_UnapplySampleCacheForFont(SampleCacheEntry* entry, s32 fontId) {
Drum* drum; Drum* drum;
Instrument* inst; Instrument* inst;
SoundFontSound* sfx; SoundFontSound* sfx;
s32 instId; size_t instId;
s32 drumId; size_t drumId;
s32 sfxId; size_t sfxId;
for (instId = 0; instId < gAudioContext.soundFonts[fontId].numInstruments; instId++) { for (instId = 0; instId < gAudioContext.soundFonts[fontId].numInstruments; instId++) {
inst = Audio_GetInstrumentInner(fontId, instId); inst = Audio_GetInstrumentInner(fontId, instId);
@ -1203,7 +1203,7 @@ void AudioHeap_DiscardSampleCacheEntry(SampleCacheEntry* entry) {
} }
} }
void AudioHeap_UnapplySampleCache(SampleCacheEntry* entry, SoundFontSample* sample) void AudioHeap_UnapplySampleCache(SampleCacheEntry* entry, SoundFontSample* sample)
{ {
if (!gUseLegacySD) if (!gUseLegacySD)
return; return;
@ -1306,7 +1306,7 @@ void AudioHeap_ApplySampleBankCacheInternal(s32 apply, s32 sampleBankId) {
s32 numFonts; s32 numFonts;
s32 instId; s32 instId;
s32 drumId; s32 drumId;
s32 sfxId; size_t sfxId;
StorageChange change; StorageChange change;
s32 sampleBankId1; s32 sampleBankId1;
s32 sampleBankId2; s32 sampleBankId2;

2
soh/src/code/audio_init_params.c
View File

@ -10,7 +10,7 @@ const s16 D_8014A6C0[] = {
0x0030, // gTatumsPerBeat 0x0030, // gTatumsPerBeat
}; };
const AudioContextInitSizes D_8014A6C4 = { 0x37F00, 0xE0E0, 0xBCE0 }; const AudioContextInitSizes D_8014A6C4 = { 0x57F00, 0x2E0E0, 0xFCE0 };
ReverbSettings D_80133420[][3] = { ReverbSettings D_80133420[][3] = {
{ {

4
soh/src/code/audio_synthesis.c
View File

@ -382,11 +382,11 @@ void AudioSynth_EnvSetup1(Acmd* cmd, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
void func_800DBD08(void) { void func_800DBD08(void) {
} }
void AudioSynth_LoadBuffer(Acmd* cmd, s32 arg1, s32 arg2, s32 arg3) { void AudioSynth_LoadBuffer(Acmd* cmd, s32 arg1, s32 arg2, uintptr_t arg3) {
aLoadBuffer(cmd, arg3, arg1, arg2); aLoadBuffer(cmd, arg3, arg1, arg2);
} }
void AudioSynth_SaveBuffer(Acmd* cmd, s32 arg1, s32 arg2, s32 arg3) { void AudioSynth_SaveBuffer(Acmd* cmd, s32 arg1, s32 arg2, uintptr_t arg3) {
aSaveBuffer(cmd, arg1, arg3, arg2); aSaveBuffer(cmd, arg1, arg3, arg2);
} }

2
soh/src/code/code_800F7260.c
View File

@ -124,7 +124,7 @@ void Audio_ClearBGMMute(u8 channelIdx) {
void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* pos, u8 token, f32* freqScale, f32* vol, s8* reverbAdd) void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* pos, u8 token, f32* freqScale, f32* vol, s8* reverbAdd)
{ {
u8 i; size_t i;
SoundRequest* req; SoundRequest* req;
if (!gSoundBankMuted[SFX_BANK_SHIFT(sfxId)]) { if (!gSoundBankMuted[SFX_BANK_SHIFT(sfxId)]) {