imported winuaesrc1340b9b.zip

diff --git a/od-win32/sounddep/sound.c b/od-win32/sounddep/sound.c
index ff7b8974b8e7621c13567cbcd6c66dd6c9a46e33..96145804649788783b7e304fe7096fd322c28b5b 100755 (executable)
--- 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 5392a4e54f38c02cf6e7774b894f7b68040ad025..97a2b9a282c09183b6f78b8d75063ae095d59cea 100755 (executable)
--- 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?)