Skip to content

Shut down audio on XAudioUnregisterRenderDriverClient #370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
squidbus merged 1 commit into from
Nov 9, 2026
Merged

Shut down audio on XAudioUnregisterRenderDriverClient #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions MarathonRecomp/apu/audio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ uint32_t XAudioRegisterRenderDriverClient(be<uint32_t>* callback, be<uint32_t>*

uint32_t XAudioUnregisterRenderDriverClient(uint32_t driver)
{
XAudioUnregisterClient();
return 0;
}

Expand Down
5 changes: 3 additions & 2 deletions MarathonRecomp/apu/audio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@

void XAudioInitializeSystem();
void XAudioRegisterClient(PPCFunc* callback, uint32_t param);
void XAudioUnregisterClient();
void XAudioSubmitFrame(void* samples);
void XAudioConfigValueChangedCallback(class IConfigDef* configDef);

uint32_t XAudioRegisterRenderDriverClient(be<uint32_t>* callback, be<uint32_t>* driver);
uint32_t XAudioUnregisterRenderDriverClient(uint32_t driver);
uint32_t XAudioRegisterRenderDriverClient(be<uint32_t>* callback, be<uint32_t>* driver);
uint32_t XAudioUnregisterRenderDriverClient(uint32_t driver);
uint32_t XAudioSubmitRenderDriverFrame(uint32_t driver, void* samples);
18 changes: 18 additions & 0 deletions MarathonRecomp/apu/driver/sdl3_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,24 @@ void XAudioRegisterClient(PPCFunc* callback, uint32_t param)
CreateAudioThread();
}

void XAudioUnregisterClient()
{
if (g_audioThread)
{
g_audioThreadShouldExit = true;
g_audioThread->Join();
g_audioThread.reset();
}

if (g_clientCallbackParam)
{
g_userHeap.Free(g_memory.Translate(g_clientCallbackParam));
g_clientCallbackParam = 0;
}

g_clientCallback = nullptr;
}

void XAudioSubmitFrame(void* samples)
{
auto floatSamples = reinterpret_cast<be<float>*>(samples);
Expand Down
Loading