From 18ce176ad74b6341365ba772551f6c2c5801259d Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sun, 7 Jan 2024 03:30:32 -0500 Subject: [PATCH] m_Do_audio OK --- configure.py | 2 +- include/JSystem/JAudio/JAIStreamMgr.h | 2 +- src/JSystem/JAudio/JAIStreamMgr.cpp | 2 +- src/m_Do/m_Do_audio.cpp | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.py b/configure.py index 646221ea3..bd902af9b 100644 --- a/configure.py +++ b/configure.py @@ -258,7 +258,7 @@ config.libs = [ # machine Object(Matching, "m_Do/m_Do_main.cpp"), Object(Matching, "m_Do/m_Do_printf.cpp"), - Object(NonMatching, "m_Do/m_Do_audio.cpp"), + Object(Matching, "m_Do/m_Do_audio.cpp"), Object(Matching, "m_Do/m_Do_controller_pad.cpp"), Object(NonMatching, "m_Do/m_Do_graphic.cpp"), Object(Matching, "m_Do/m_Do_machine.cpp"), diff --git a/include/JSystem/JAudio/JAIStreamMgr.h b/include/JSystem/JAudio/JAIStreamMgr.h index da5162161..c965bf697 100644 --- a/include/JSystem/JAudio/JAIStreamMgr.h +++ b/include/JSystem/JAudio/JAIStreamMgr.h @@ -42,7 +42,7 @@ namespace JAInter { void init(bool); void allocBuffer(void*, s32); bool deallocBuffer(); - int getNeedBufferSize(); + u32 getNeedBufferSize(); void setAllocBufferCallback(void (*)(void)); void setDeallocBufferCallback(void (*)(void)); void sync(s32); diff --git a/src/JSystem/JAudio/JAIStreamMgr.cpp b/src/JSystem/JAudio/JAIStreamMgr.cpp index 5982389c5..1731cae59 100644 --- a/src/JSystem/JAudio/JAIStreamMgr.cpp +++ b/src/JSystem/JAudio/JAIStreamMgr.cpp @@ -163,7 +163,7 @@ bool JAInter::StreamLib::deallocBuffer() { } /* 8029CC50-8029CCA4 .text getNeedBufferSize__Q27JAInter9StreamLibFv */ -int JAInter::StreamLib::getNeedBufferSize() { +u32 JAInter::StreamLib::getNeedBufferSize() { /* Nonmatching */ } diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp index c385c1c71..a87bdc622 100644 --- a/src/m_Do/m_Do_audio.cpp +++ b/src/m_Do/m_Do_audio.cpp @@ -15,6 +15,8 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_printf.h" +u8 dummy_3569[0xC]; + JAIZelInst mDoAud_zelAudio_c::mTact; mDoAud_zelAudio_c g_mDoAud_zelAudio; @@ -49,10 +51,9 @@ JKRExpHeap* mDoAud_audioStreamHeap; /* 80006DD4-80006F88 .text mDoAud_allocStreamBuffer__Fv */ void mDoAud_allocStreamBuffer() { - /* Nonmatching */ JUT_ASSERT(98, mDoAud_StreamBufferPointer == 0); u32 var1 = mDoAud_StreamBufferBlocks; - s32 size; + u32 size; while (true) { JAIGlobalParameter::setParamStreamDecodedBufferBlocks(var1); size = JAInter::StreamLib::getNeedBufferSize();