Jörg Höhle : Revert "winmm: Fix PlaySound so it doesn't block when another sound is already playing.".
Alexandre Julliard
julliard at winehq.org
Wed Mar 30 13:15:37 CDT 2011
Module: wine
Branch: master
Commit: 15ad749eced53e0c33454970bfc2bdb58b64f92b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=15ad749eced53e0c33454970bfc2bdb58b64f92b
Author: Jörg Höhle <hoehle at users.sourceforge.net>
Date: Sat Mar 26 07:44:22 2011 +0100
Revert "winmm: Fix PlaySound so it doesn't block when another sound is already playing.".
This reverts commit f44bc89bc41b2b8d75eeb4fc02f5aa587d84c13c.
Let the player thread call waveOutReset itself instead.
---
dlls/winmm/playsound.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c
index f6416ed..58c833a 100644
--- a/dlls/winmm/playsound.c
+++ b/dlls/winmm/playsound.c
@@ -45,7 +45,6 @@ typedef struct tagWINE_PLAYSOUND
HMODULE hMod;
DWORD fdwSound;
HANDLE hThread;
- HWAVEOUT hWave;
struct tagWINE_PLAYSOUND* lpNext;
} WINE_PLAYSOUND;
@@ -271,6 +270,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg)
MMCKINFO ckMainRIFF;
MMCKINFO mmckInfo;
LPWAVEFORMATEX lpWaveFormat = NULL;
+ HWAVEOUT hWave = 0;
LPWAVEHDR waveHdr = NULL;
INT count, bufsize, left, index;
struct playsound_data s;
@@ -399,7 +399,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg)
s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
- if (waveOutOpen(&wps->hWave, WAVE_MAPPER, lpWaveFormat, (DWORD_PTR)PlaySound_Callback,
+ if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD_PTR)PlaySound_Callback,
(DWORD_PTR)&s, CALLBACK_FUNCTION) != MMSYSERR_NOERROR)
goto errCleanUp;
@@ -413,8 +413,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg)
waveHdr[0].dwLoops = waveHdr[1].dwLoops = 0L;
waveHdr[0].dwFlags = waveHdr[1].dwFlags = 0L;
waveHdr[0].dwBufferLength = waveHdr[1].dwBufferLength = bufsize;
- if (waveOutPrepareHeader(wps->hWave, &waveHdr[0], sizeof(WAVEHDR)) ||
- waveOutPrepareHeader(wps->hWave, &waveHdr[1], sizeof(WAVEHDR))) {
+ if (waveOutPrepareHeader(hWave, &waveHdr[0], sizeof(WAVEHDR)) ||
+ waveOutPrepareHeader(hWave, &waveHdr[1], sizeof(WAVEHDR))) {
goto errCleanUp;
}
@@ -429,6 +429,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg)
{
if (WaitForSingleObject(psStopEvent, 0) == WAIT_OBJECT_0)
{
+ waveOutReset(hWave);
wps->bLoop = FALSE;
break;
}
@@ -437,7 +438,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg)
left -= count;
waveHdr[index].dwBufferLength = count;
waveHdr[index].dwFlags &= ~WHDR_DONE;
- if (waveOutWrite(wps->hWave, &waveHdr[index], sizeof(WAVEHDR)) == MMSYSERR_NOERROR) {
+ if (waveOutWrite(hWave, &waveHdr[index], sizeof(WAVEHDR)) == MMSYSERR_NOERROR) {
index ^= 1;
PlaySound_WaitDone(&s);
}
@@ -447,17 +448,17 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg)
} while (wps->bLoop);
PlaySound_WaitDone(&s); /* for last buffer */
- waveOutReset(wps->hWave);
+ waveOutReset(hWave);
- waveOutUnprepareHeader(wps->hWave, &waveHdr[0], sizeof(WAVEHDR));
- waveOutUnprepareHeader(wps->hWave, &waveHdr[1], sizeof(WAVEHDR));
+ waveOutUnprepareHeader(hWave, &waveHdr[0], sizeof(WAVEHDR));
+ waveOutUnprepareHeader(hWave, &waveHdr[1], sizeof(WAVEHDR));
errCleanUp:
TRACE("Done playing=%s => %s!\n", debugstr_w(wps->pszSound), bRet ? "ok" : "ko");
CloseHandle(s.hEvent);
HeapFree(GetProcessHeap(), 0, waveHdr);
HeapFree(GetProcessHeap(), 0, lpWaveFormat);
- if (wps->hWave) while (waveOutClose(wps->hWave) == WAVERR_STILLPLAYING) Sleep(100);
+ if (hWave) while (waveOutClose(hWave) == WAVERR_STILLPLAYING) Sleep(100);
if (hmmio) mmioClose(hmmio, 0);
PlaySound_Free(wps);
@@ -494,7 +495,6 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo
* NULL... as of today, we stop all playing instances */
SetEvent(psStopEvent);
- waveOutReset(PlaySoundList->hWave);
LeaveCriticalSection(&WINMM_cs);
WaitForSingleObject(psLastEvent, INFINITE);
EnterCriticalSection(&WINMM_cs);
More information about the wine-cvs
mailing list