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

dsound: Don't send notify events before played range.

This commit is contained in:
Andrew Eikum 2014-12-19 09:10:46 -06:00 committed by Alexandre Julliard
parent 6f98de084b
commit 29d1ccc7e2
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/dsound/mixer.c
View File

@ -223,16 +223,20 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len
}
}
TRACE("Not stopped: first notify: %u (%u), range: [%u,%u)\n", first,
dsb->notifies[check].dwOffset, playpos, (playpos + len) % dsb->buflen);
TRACE("Not stopped: first notify: %u (%u), left notify: %u (%u), range: [%u,%u)\n",
first, dsb->notifies[first].dwOffset,
left, dsb->notifies[left].dwOffset,
playpos, (playpos + len) % dsb->buflen);
/* send notifications in range */
for(check = left; check < dsb->nrofnotifies; ++check){
if(dsb->notifies[check].dwOffset >= playpos + len)
break;
if(dsb->notifies[left].dwOffset >= playpos){
for(check = left; check < dsb->nrofnotifies; ++check){
if(dsb->notifies[check].dwOffset >= playpos + len)
break;
TRACE("Signalling %p (%u)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset);
SetEvent(dsb->notifies[check].hEventNotify);
TRACE("Signalling %p (%u)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset);
SetEvent(dsb->notifies[check].hEventNotify);
}
}
if(playpos + len > dsb->buflen){

5
dlls/dsound/tests/dsound.c
View File

@ -1532,10 +1532,9 @@ static void test_notifications(LPGUID lpGuid)
rc = IDirectSoundBuffer_QueryInterface(buf, &IID_IDirectSoundNotify, (void**)&buf_notif);
ok(rc == DS_OK, "QueryInterface(IID_IDirectSoundNotify): %08x\n", rc);
/* create notifications at each end of the buffer */
notifies[0].dwOffset = 0;
handles[0] = notifies[0].hEventNotify = CreateEventW(NULL, FALSE, FALSE, NULL);
notifies[1].dwOffset = bufdesc.dwBufferBytes - 1;
notifies[1].dwOffset = bufdesc.dwBufferBytes / 2;
handles[1] = notifies[1].hEventNotify = CreateEventW(NULL, FALSE, FALSE, NULL);
rc = IDirectSoundNotify_SetNotificationPositions(buf_notif, 2, notifies);
@ -1550,8 +1549,6 @@ static void test_notifications(LPGUID lpGuid)
for(cycles = 0; cycles < 6 /* 1.5s */; ++cycles){
DWORD wait;
/* since the notifications are on opposite ends of the entire buffer,
* they should arrive well-ordered in an alternating sequence. */
wait = WaitForMultipleObjects(2, handles, FALSE, 1000);
ok(wait <= WAIT_OBJECT_0 + 1 && wait - WAIT_OBJECT_0 == expect,
"Got unexpected notification order or timeout: %u\n", wait);