ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

A bit more robust against wave???Open failures.

This commit is contained in:
Eric Pouech 2002-04-22 22:36:18 +00:00 committed by Alexandre Julliard
parent 90b71b5191
commit c745b52803
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/dsound/dsound_main.c
View File

@ -1186,12 +1186,13 @@ static HRESULT DSOUND_PrimaryStop(IDirectSoundBufferImpl *dsb)
IDsDriverBuffer_Release(primarybuf->hwbuf); IDsDriverBuffer_Release(primarybuf->hwbuf);
waveOutClose(dsb->dsound->hwo); waveOutClose(dsb->dsound->hwo);
dsb->dsound->hwo = 0; dsb->dsound->hwo = 0;
waveOutOpen(&(dsb->dsound->hwo), dsb->dsound->drvdesc.dnDevNode, err = mmErr(waveOutOpen(&(dsb->dsound->hwo), dsb->dsound->drvdesc.dnDevNode,
&(primarybuf->wfx), (DWORD)DSOUND_callback, (DWORD)dsb->dsound, &(primarybuf->wfx), (DWORD)DSOUND_callback, (DWORD)dsb->dsound,
CALLBACK_FUNCTION | WAVE_DIRECTSOUND); CALLBACK_FUNCTION | WAVE_DIRECTSOUND));
err = IDsDriver_CreateSoundBuffer(dsb->dsound->driver,&(dsb->wfx),dsb->dsbd.dwFlags,0, if (err == DS_OK)
&(dsb->buflen),&(dsb->buffer), err = IDsDriver_CreateSoundBuffer(dsb->dsound->driver,&(dsb->wfx),dsb->dsbd.dwFlags,0,
(LPVOID)&(dsb->hwbuf)); &(dsb->buflen),&(dsb->buffer),
(LPVOID)&(dsb->hwbuf));
} }
} }
else else
@ -1253,10 +1254,11 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFormat(
DSOUND_PrimaryClose(primarybuf); DSOUND_PrimaryClose(primarybuf);
waveOutClose(This->dsound->hwo); waveOutClose(This->dsound->hwo);
This->dsound->hwo = 0; This->dsound->hwo = 0;
waveOutOpen(&(This->dsound->hwo), This->dsound->drvdesc.dnDevNode, err = mmErr(waveOutOpen(&(This->dsound->hwo), This->dsound->drvdesc.dnDevNode,
&(primarybuf->wfx), (DWORD)DSOUND_callback, (DWORD)This->dsound, &(primarybuf->wfx), (DWORD)DSOUND_callback, (DWORD)This->dsound,
CALLBACK_FUNCTION | WAVE_DIRECTSOUND); CALLBACK_FUNCTION | WAVE_DIRECTSOUND));
DSOUND_PrimaryOpen(primarybuf); if (err == DS_OK)
DSOUND_PrimaryOpen(primarybuf);
} }
if (primarybuf->hwbuf) { if (primarybuf->hwbuf) {
err = IDsDriverBuffer_SetFormat(primarybuf->hwbuf, &(primarybuf->wfx)); err = IDsDriverBuffer_SetFormat(primarybuf->hwbuf, &(primarybuf->wfx));
@ -1269,13 +1271,14 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFormat(
if (primarybuf->state == STATE_PLAYING) primarybuf->state = STATE_STARTING; if (primarybuf->state == STATE_PLAYING) primarybuf->state = STATE_STARTING;
else if (primarybuf->state == STATE_STOPPING) primarybuf->state = STATE_STOPPED; else if (primarybuf->state == STATE_STOPPING) primarybuf->state = STATE_STOPPED;
} }
/* FIXME: should we set err back to DS_OK in all cases ? */
} }
DSOUND_RecalcFormat(primarybuf); DSOUND_RecalcFormat(primarybuf);
LeaveCriticalSection(&(This->dsound->lock)); LeaveCriticalSection(&(This->dsound->lock));
/* **** */ /* **** */
return DS_OK; return err;
} }
static HRESULT WINAPI IDirectSoundBufferImpl_SetVolume( static HRESULT WINAPI IDirectSoundBufferImpl_SetVolume(