Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2025-02-16 17:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Slight tweak to changes made to sound board synchronisation code in previous commit. The previous change was necessary to ensure no deadlock when waiting for sound board thread to exit but it introduced unwanted buffer overruns (with the end result being that the sound was often speeded up) so have added an extra check in WakeSoundBoardThread to prevent this.

Browse source
This commit is contained in:
Nik Henson 2012-07-24 20:18:30 +00:00
parent 108ac64de8
commit a3c15e8208
1 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Src/Model3/Model3.cpp
View file

@ -2491,15 +2491,30 @@ bool CModel3::WakeSoundBoardThread(void)
if (!sndBrdNotifyLock->Lock())
goto ThreadError;
// Signal to sound board thread that it should start processing again
sndBrdWakeNotify = true;
if (!sndBrdNotifySync->Signal())
// Enter main notify critical section
if (!notifyLock->Lock())
goto ThreadError;
// Exit sound board notify critical section
// See if sound board thread is currently running
bool wake = !sndBrdThreadRunning;
// Leave main notify critical section
if (!notifyLock->Unlock())
goto ThreadError;
// Only send wake notification to sound board thread if it was not running
if (wake)
{
// Signal to sound board thread that it should start processing again
sndBrdWakeNotify = true;
if (!sndBrdNotifySync->Signal())
goto ThreadError;
}
// Leave sound board notify critical section
if (!sndBrdNotifyLock->Unlock())
goto ThreadError;
return true;
return wake;
ThreadError:
ErrorLog("Threading error in WakeSoundBoardThread: %s\nSwitching back to single-threaded mode.\n", CThread::GetLastError());
@ -2526,10 +2541,6 @@ int CModel3::RunSoundBoardThread(void)
goto ThreadError;
}
sndBrdWakeNotify = false;
// Exit sound board notify critical section
if (!sndBrdNotifyLock->Unlock())
goto ThreadError;
// Enter main notify critical section
if (!notifyLock->Lock())
@ -2547,6 +2558,10 @@ int CModel3::RunSoundBoardThread(void)
// Leave main notify critical section
if (!notifyLock->Unlock())
goto ThreadError;
// Leave sound board notify critical section
if (!sndBrdNotifyLock->Unlock())
goto ThreadError;
}
if (exit)
return 0;
@ -2555,11 +2570,10 @@ int CModel3::RunSoundBoardThread(void)
while (true)
{
// Enter main notify critical section
bool paused;
if (!notifyLock->Lock())
goto ThreadError;
paused = pauseThreads;
bool paused = pauseThreads;
// Leave main notify critical section
if (!notifyLock->Unlock())