mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r18934) -Fix (r18892, r18913): the deadlock should be definitively gone now

release/1.0
glx 2010-01-28 13:49:20 +00:00
parent 08a24fcc31
commit 27491c5586
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/sound/win32_s.cpp
View File

@ -26,6 +26,7 @@ static WAVEHDR _wave_hdr[2];
static int _bufsize; static int _bufsize;
static HANDLE _thread; static HANDLE _thread;
static DWORD _threadId; static DWORD _threadId;
static HANDLE _event;
static void PrepareHeader(WAVEHDR *hdr) static void PrepareHeader(WAVEHDR *hdr)
{ {
@ -37,18 +38,14 @@ static void PrepareHeader(WAVEHDR *hdr)
static DWORD WINAPI SoundThread(LPVOID arg) static DWORD WINAPI SoundThread(LPVOID arg)
{ {
MSG msg; do {
while (_waveout != NULL) {
for (WAVEHDR *hdr = _wave_hdr; hdr != endof(_wave_hdr); hdr++) { for (WAVEHDR *hdr = _wave_hdr; hdr != endof(_wave_hdr); hdr++) {
if ((hdr->dwFlags & WHDR_INQUEUE) != 0) continue; if ((hdr->dwFlags & WHDR_INQUEUE) != 0) continue;
MxMixSamples(hdr->lpData, hdr->dwBufferLength / 4); MxMixSamples(hdr->lpData, hdr->dwBufferLength / 4);
if (waveOutWrite(_waveout, hdr, sizeof(WAVEHDR)) != MMSYSERR_NOERROR) usererror("waveOutWrite failed"); if (waveOutWrite(_waveout, hdr, sizeof(WAVEHDR)) != MMSYSERR_NOERROR) usererror("waveOutWrite failed");
} }
WaitForSingleObject(_event, INFINITE);
/* Wait for the device to be closed or ready to play new data. */ } while (_waveout != NULL);
GetMessage(&msg, NULL, MM_WOM_CLOSE, MM_WOM_DONE);
}
return 0; return 0;
} }
@ -65,19 +62,16 @@ const char *SoundDriver_Win32::Start(const char * const *parm)
_bufsize = GetDriverParamInt(parm, "bufsize", (GB(GetVersion(), 0, 8) > 5) ? 8192 : 4096); _bufsize = GetDriverParamInt(parm, "bufsize", (GB(GetVersion(), 0, 8) > 5) ? 8192 : 4096);
/* Create the sound thread in suspended state because we are not ready to play anything. */ if (NULL == (_event = CreateEvent(NULL, FALSE, FALSE, NULL))) return "Failed to create event";
if (NULL == (_thread = CreateThread(NULL, 8192, SoundThread, 0, CREATE_SUSPENDED, &_threadId))) return "Failed to create thread";
/* Open the sound device, it will send messages to sound thread. */ if (waveOutOpen(&_waveout, WAVE_MAPPER, &wfex, (DWORD_PTR)_event, 0, CALLBACK_EVENT) != MMSYSERR_NOERROR) return "waveOutOpen failed";
if (waveOutOpen(&_waveout, WAVE_MAPPER, &wfex, (DWORD_PTR)_threadId, 0, CALLBACK_THREAD) != MMSYSERR_NOERROR) return "waveOutOpen failed";
MxInitialize(wfex.nSamplesPerSec); MxInitialize(wfex.nSamplesPerSec);
PrepareHeader(&_wave_hdr[0]); PrepareHeader(&_wave_hdr[0]);
PrepareHeader(&_wave_hdr[1]); PrepareHeader(&_wave_hdr[1]);
/* We are now ready to play sound, so resume the sound thread. */ if (NULL == (_thread = CreateThread(NULL, 8192, SoundThread, 0, 0, &_threadId))) return "Failed to create thread";
ResumeThread(_thread);
return NULL; return NULL;
} }
@ -86,16 +80,17 @@ void SoundDriver_Win32::Stop()
{ {
HWAVEOUT waveout = _waveout; HWAVEOUT waveout = _waveout;
/* Break the sound thread loop, but the thread can still be waiting for a message. */ /* Stop the sound thread. */
_waveout = NULL; _waveout = NULL;
SetEvent(_event);
WaitForSingleObject(_thread, INFINITE);
/* Stop the playback (if any) and close the device. This will unlock the thread if it's waiting for a message. */ /* Close the sound device. */
waveOutReset(waveout); // Triggers MM_WOM_DONE message if there were pending playbacks. waveOutReset(waveout);
waveOutUnprepareHeader(waveout, &_wave_hdr[0], sizeof(WAVEHDR)); waveOutUnprepareHeader(waveout, &_wave_hdr[0], sizeof(WAVEHDR));
waveOutUnprepareHeader(waveout, &_wave_hdr[1], sizeof(WAVEHDR)); waveOutUnprepareHeader(waveout, &_wave_hdr[1], sizeof(WAVEHDR));
waveOutClose(waveout); // Triggers MM_WOM_CLOSE message. waveOutClose(waveout);
/* Now we can wait for the sound thread to finish because we know it will. */
WaitForMultipleObjects(1, &_thread, true, INFINITE);
CloseHandle(_thread); CloseHandle(_thread);
CloseHandle(_event);
} }