Correction to earlier assertion patch to allow for buf_mixpos ==

buflen in non-looping case, fixes looping of one-off mixed samples introduced by previous patch.

Correction to earlier assertion patch to allow for buf_mixpos ==
5577cc73 · Alex Villacís Lasso · Alexandre Julliard · b1722b7a · 5577cc73
Commit 5577cc73 authored Aug 03, 2005 by Alex Villacís Lasso Committed by Alexandre Julliard Aug 03, 2005
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

mixer.c dlls/dsound/mixer.c +3 -1

No files found.
--- a/dlls/dsound/mixer.c
+++ b/dlls/dsound/mixer.c
@@ -490,8 +490,10 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO
 			dsb->buf_mixpos %= dsb->buflen;
 			if (dsb->leadin && (dsb->startpos <= dsb->buf_mixpos))
 				dsb->leadin = FALSE; /* HACK: see above */
+		} else if (dsb->buf_mixpos > dsb->buflen) {
+			ERR("Mixpos (%lu) past buflen (%lu), capping...\n", dsb->buf_mixpos, dsb->buflen);
+			dsb->buf_mixpos = dsb->buflen;
 		}
-		else dsb->buf_mixpos = 0; /* %= dsb->buflen; */
 	}

 	return len;