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

dsound: Allow mixing the same buffer multiple times if we are looping.

This commit is contained in:
Maarten Lankhorst 2007-07-12 13:21:43 +02:00 committed by Alexandre Julliard
parent 93b6f15826
commit f3ed32bca0
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dlls/dsound/mixer.c
View File

@ -543,6 +543,12 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO
dsb->leadin = FALSE; dsb->leadin = FALSE;
} }
/* check for notification positions */
if (dsb->dsbd.dwFlags & DSBCAPS_CTRLPOSITIONNOTIFY &&
dsb->state != STATE_STARTING) {
DSOUND_CheckEvent(dsb, dsb->buf_mixpos, ilen);
}
dsb->buf_mixpos += ilen; dsb->buf_mixpos += ilen;
if (dsb->buf_mixpos >= dsb->buflen) { if (dsb->buf_mixpos >= dsb->buflen) {
@ -557,6 +563,9 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO
} }
} }
/* increase mix position */
dsb->primary_mixpos += len;
dsb->primary_mixpos %= dsb->device->buflen;
return len; return len;
} }
@ -607,27 +616,32 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD playpos, DWORD wri
} }
/* take into acount already mixed data */ /* take into acount already mixed data */
mixlen = mixlen - primary_done; mixlen -= primary_done;
TRACE("mixlen (primary) = %i\n", mixlen); TRACE("primary_done=%d, mixlen (primary) = %i\n", primary_done, mixlen);
if ((dsb->playflags & DSBPLAY_LOOPING) && mixlen > buflen)
{
while (mixlen > buflen)
{
DWORD mixedlength = DSOUND_MixInBuffer(dsb, dsb->primary_mixpos, buflen);
mixlen -= buflen;
if (!mixedlength)
{
mixlen = 0;
break;
}
}
}
/* clip to valid length */ /* clip to valid length */
mixlen = (buflen < mixlen) ? buflen : mixlen; mixlen = (buflen < mixlen) ? buflen : mixlen;
TRACE("mixlen (buffer)=%d\n", mixlen);
TRACE("primary_done=%d, mixlen (buffer)=%d\n", primary_done, mixlen); if (mixlen)
/* mix more data */
/* mix more data */ mixlen = DSOUND_MixInBuffer(dsb, dsb->primary_mixpos, mixlen);
mixlen = DSOUND_MixInBuffer(dsb, dsb->primary_mixpos, mixlen);
/* check for notification positions */
if (dsb->dsbd.dwFlags & DSBCAPS_CTRLPOSITIONNOTIFY &&
dsb->state != STATE_STARTING) {
DSOUND_CheckEvent(dsb, writepos, mixlen / dsb->device->pwfx->nBlockAlign * dsb->pwfx->nBlockAlign);
}
/* increase mix position */
dsb->primary_mixpos += mixlen;
dsb->primary_mixpos %= dsb->device->buflen;
TRACE("new primary_mixpos=%d, mixed data len=%d, buffer left = %d\n", TRACE("new primary_mixpos=%d, mixed data len=%d, buffer left = %d\n",
dsb->primary_mixpos, mixlen, (dsb->buflen - dsb->buf_mixpos)); dsb->primary_mixpos, mixlen, (dsb->buflen - dsb->buf_mixpos));