mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-05-29 16:44:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

snd_SoundThread OK

Browse Source
This commit is contained in:
robojumper
2025-05-26 00:42:57 +02:00
parent 83a7f21b96
commit a9da90bbb2
5 changed files with 59 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nw4r/snd/snd_SoundThread.cpp
+49 -39
View File
@@ -35,7 +35,8 @@ namespace nw4r { namespace snd { namespace detail {
SoundThread::SoundThread() :
mStackEnd (nullptr),
mCreateFlag (false)
mCreateFlag (false),
field_0x395 (false)
{
OSInitMessageQueue(&mMsgQueue, mMsgBuffer, THREAD_MESSAGE_BUFSIZE);
OSInitThreadQueue(&mThreadQueue);
@@ -96,8 +97,10 @@ void SoundThread::AxCallbackFunc()
void SoundThread::AxCallbackProc()
{
BOOL result ATTR_UNUSED =
OSSendMessageAny(&mMsgQueue, MESSAGE_AX_CALLBACK, OS_MESSAGE_NO_FLAGS);
if (!field_0x395) {
BOOL result ATTR_UNUSED =
OSSendMessageAny(&mMsgQueue, MESSAGE_AX_CALLBACK, OS_MESSAGE_NO_FLAGS);
}
NW4R_RANGE_FOR_NO_AUTO_INC(itr, mPlayerCallbackList)
{
@@ -123,6 +126,7 @@ void *SoundThread::SoundThreadFunc(void *arg)
return nullptr;
}
#ifdef DEBUG
/* SoundThread::RegisterSoundFrameCallback
* ([R89JEL]:/bin/RVL/Debug/mainD.MAP:14509)
*/
@@ -134,6 +138,7 @@ DECOMP_FORCE_CLASS_METHOD(SoundThread::SoundFrameCallback::LinkList,
*/
DECOMP_FORCE_CLASS_METHOD(SoundThread::SoundFrameCallback::LinkList,
Erase(nullptr));
#endif
void SoundThread::RegisterPlayerCallback(PlayerCallback *callback)
{
@@ -159,42 +164,7 @@ void SoundThread::SoundThreadProc()
if (reinterpret_cast<u32>(message) == MESSAGE_AX_CALLBACK)
{
ut::detail::AutoLock<OSMutex> lock(mMutex);
NW4R_RANGE_FOR_NO_AUTO_INC(itr, mSoundFrameCallbackList)
{
decltype(itr) curItr = itr++;
curItr->at_0x0c();
}
OSTick tick = OSGetTick();
{
// Sound frame
AxVoiceManager::GetInstance().FreeAllReservedAxVoice();
AxManager::GetInstance().Update();
NW4R_RANGE_FOR_NO_AUTO_INC(itr, mPlayerCallbackList)
{
decltype(itr) curItr = itr++;
curItr->OnUpdateFrameSoundThread();
}
ChannelManager::GetInstance().UpdateAllChannel();
(void)Util::CalcRandom(); // ?
VoiceManager::GetInstance().UpdateAllVoices();
}
mProcessTick = OSGetTick() - tick;
NW4R_RANGE_FOR_NO_AUTO_INC(itr, mSoundFrameCallbackList)
{
decltype(itr) curItr = itr++;
curItr->at_0x10();
}
FrameProcess();
}
else if (reinterpret_cast<u32>(message) == MESSAGE_SHUTDOWN)
{
@@ -212,4 +182,44 @@ void SoundThread::SoundThreadProc()
}
}
void SoundThread::FrameProcess()
{
ut::detail::AutoLock<OSMutex> lock(mMutex);
NW4R_RANGE_FOR_NO_AUTO_INC(itr, mSoundFrameCallbackList)
{
decltype(itr) curItr = itr++;
curItr->at_0x0c();
}
OSTick tick = OSGetTick();
{
// Sound frame
AxVoiceManager::GetInstance().FreeAllReservedAxVoice();
AxManager::GetInstance().Update();
NW4R_RANGE_FOR_NO_AUTO_INC(itr, mPlayerCallbackList)
{
decltype(itr) curItr = itr++;
curItr->OnUpdateFrameSoundThread();
}
ChannelManager::GetInstance().UpdateAllChannel();
(void)Util::CalcRandom(); // ?
VoiceManager::GetInstance().UpdateAllVoices();
}
mProcessTick = OSGetTick() - tick;
NW4R_RANGE_FOR_NO_AUTO_INC(itr, mSoundFrameCallbackList)
{
decltype(itr) curItr = itr++;
curItr->at_0x10();
}
}
}}} // namespace nw4r::snd::detail