From: Toni Wilen <twilen@winuae.net>
Date: Fri, 29 Dec 2006 18:37:05 +0000 (+0200)
Subject: imported winuaesrc1340b9b.zip
X-Git-Tag: 2100~253
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=8f19021be20699d0c20e802a2ef62faaeeaf3175;p=francis%2Fwinuae.git

imported winuaesrc1340b9b.zip
---

diff --git a/od-win32/sounddep/sound.c b/od-win32/sounddep/sound.c
index ff7b8974..96145804 100755
--- a/od-win32/sounddep/sound.c
+++ b/od-win32/sounddep/sound.c
@@ -509,7 +509,7 @@ void restart_sound_buffer(void)
 	write_log("SOUND: DirectSoundBuffer_GetCurrentPosition failed, %s\n", DXError(hr));
 	return;
     }
-    writepos = playpos + snd_writeoffset - sndbufsize;
+    writepos = playpos + snd_writeoffset;
     if (writepos < 0)
 	writepos += dsoundbuf;
     cf (writepos);
@@ -574,6 +574,7 @@ static void finish_sound_buffer_ds (void)
 	if (safedist < 64)
 	    safedist = 64;
 	cf(safedist);
+#if 0
 	snd_totalmaxoffset_uf += safedist;
 	cf (snd_totalmaxoffset_uf);
 	snd_totalmaxoffset_of += safedist;
@@ -582,6 +583,7 @@ static void finish_sound_buffer_ds (void)
 	cf (snd_maxoffset);
 	snd_writeoffset += safedist;
 	cf (snd_writeoffset);
+#endif
 	waiting_for_buffer = -1;
 	restart_sound_buffer();
 	write_log("SOUND: bs=%d w=%d max=%d tof=%d tuf=%d\n",
@@ -620,7 +622,7 @@ static void finish_sound_buffer_ds (void)
 	else
 	    diff = dsoundbuf - playpos + writepos;
 
-	if (diff < safedist || diff > snd_totalmaxoffset_uf) {
+	if (diff < sndbufsize || diff > snd_totalmaxoffset_uf) {
 #if 0
 	    hr = IDirectSoundBuffer_Lock (lpDSBsecondary, writepos, sndbufsize, &b1, &s1, &b2, &s2, 0);
 	    if (SUCCEEDED(hr)) {
diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 5392a4e5..97a2b9a2 100755
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -5,6 +5,7 @@ Beta 9:
 - CPU Idle tweak (slightly less aggressive)
 - file dialogs work again in Windows9X/ME.. Apparently
   nobody is using 9x anymore, I like it :)
+- sound problems really fixed now
 
 Beta 8: (RC3, really final?)