2 files changed, 42 insertions, 25 deletions

diff --git a/Alc/null.c b/Alc/null.c
index 43a10624..c110b3ae 100644
--- a/Alc/null.c
+++ b/Alc/null.c
@@ -30,6 +30,8 @@ typedef struct {
     ALvoid *buffer;
     ALuint size;
 
+    ALuint startTime;
+
     volatile int killNow;
     ALvoid *thread;
 } null_data;
@@ -41,30 +43,34 @@ static ALuint NullProc(ALvoid *ptr)
 {
     ALCdevice *Device = (ALCdevice*)ptr;
     null_data *data = (null_data*)Device->ExtraData;
-    ALuint frameSize;
-    ALuint now, last;
-    ALuint avail;
-
-    frameSize = aluFrameSizeFromFormat(Device->Format);
+    ALuint now, start;
+    ALuint64 avail, done;
+    const ALuint restTime = (ALuint64)Device->UpdateSize * 1000 /
+                            Device->Frequency / 2;
 
-    last = timeGetTime()<<8;
+    done = 0;
+    start = data->startTime;
     while(!data->killNow && Device->Connected)
     {
-        now = timeGetTime()<<8;
+        now = timeGetTime();
 
-        avail = (ALuint64)(now-last) * Device->Frequency / (1000<<8);
-        if(avail < Device->UpdateSize)
+        avail = (ALuint64)(now-start) * Device->Frequency / 1000;
+        if(avail < done)
         {
-            Sleep(1);
+            AL_PRINT("Timer wrapped\n");
+            aluHandleDisconnect(Device);
+            break;
+        }
+        if(avail-done < Device->UpdateSize)
+        {
+            Sleep(restTime);
             continue;
         }
 
-        while(avail >= Device->UpdateSize)
+        while(avail-done >= Device->UpdateSize)
         {
             aluMixData(Device, data->buffer, Device->UpdateSize);
-
-            avail -= Device->UpdateSize;
-            last += (ALuint64)Device->UpdateSize * (1000<<8) / Device->Frequency;
+            done += Device->UpdateSize;
         }
     }
 
@@ -111,6 +117,7 @@ static ALCboolean null_reset_playback(ALCdevice *device)
     device->TimeRes = (ALuint64)device->UpdateSize * 1000000000 /
                       device->Frequency;
 
+    data->startTime = timeGetTime();
     data->thread = StartThread(NullProc, device);
     if(data->thread == NULL)
     {
diff --git a/Alc/wave.c b/Alc/wave.c
index 1b6a41d1..5f1f399b 100644
--- a/Alc/wave.c
+++ b/Alc/wave.c
@@ -35,6 +35,8 @@ typedef struct {
     ALvoid *buffer;
     ALuint size;
 
+    ALuint startTime;
+
     volatile int killNow;
     ALvoid *thread;
 } wave_data;
@@ -68,32 +70,42 @@ static ALuint WaveProc(ALvoid *ptr)
     ALCdevice *pDevice = (ALCdevice*)ptr;
     wave_data *data = (wave_data*)pDevice->ExtraData;
     ALuint frameSize;
-    ALuint now, last;
+    ALuint now, start;
+    ALuint64 avail, done;
     size_t fs;
-    ALuint avail;
     union {
         short s;
         char b[sizeof(short)];
     } uSB;
+    const ALuint restTime = (ALuint64)pDevice->UpdateSize * 1000 /
+                            pDevice->Frequency / 2;
 
     uSB.s = 1;
     frameSize = aluFrameSizeFromFormat(pDevice->Format);
 
-    last = timeGetTime()<<8;
+    done = 0;
+    start = data->startTime;
     while(!data->killNow && pDevice->Connected)
     {
-        now = timeGetTime()<<8;
+        now = timeGetTime();
 
-        avail = (ALuint64)(now-last) * pDevice->Frequency / (1000<<8);
-        if(avail < pDevice->UpdateSize)
+        avail = (ALuint64)(now-start) * pDevice->Frequency / 1000;
+        if(avail < done)
+        {
+            AL_PRINT("Timer wrapped\n");
+            aluHandleDisconnect(pDevice);
+            break;
+        }
+        if(avail-done < pDevice->UpdateSize)
         {
-            Sleep(1);
+            Sleep(restTime);
             continue;
         }
 
-        while(avail >= pDevice->UpdateSize)
+        while(avail-done >= pDevice->UpdateSize)
         {
             aluMixData(pDevice, data->buffer, pDevice->UpdateSize);
+            done += pDevice->UpdateSize;
 
             if(uSB.b[0] != 1)
             {
@@ -125,9 +137,6 @@ static ALuint WaveProc(ALvoid *ptr)
                 aluHandleDisconnect(pDevice);
                 break;
             }
-
-            avail -= pDevice->UpdateSize;
-            last += (ALuint64)pDevice->UpdateSize * (1000<<8) / pDevice->Frequency;
         }
     }
 
@@ -277,6 +286,7 @@ static ALCboolean wave_reset_playback(ALCdevice *device)
                       device->Frequency;
     SetDefaultWFXChannelOrder(device);
 
+    data->startTime = timeGetTime();
     data->thread = StartThread(WaveProc, device);
     if(data->thread == NULL)
     {