Changeset 3326 for trunk/src/winmm/dwaveout.cpp

Timestamp:

Apr 6, 2000, 2:04:29 PM (25 years ago)

Author:

sandervl

Message:

callback (msg) fix

File:

• trunk/src/winmm/dwaveout.cpp (modified) (4 diffs)

trunk/src/winmm/dwaveout.cpp

@@ -1 @@
-/* $Id: dwaveout.cpp,v 1.19 2000-04-05 18:39:23 sandervl Exp $ */
+/* $Id: dwaveout.cpp,v 1.20 2000-04-06 12:04:29 sandervl Exp $ */
 
 /*
@@ -376 +376 @@
             memset(MixBuffer[i].pBuffer, 0, MixBuffer[i].ulBufferLength);
         }
-        dprintf(("Dart opened, bufsize = %d\n", MixBuffer[i].ulBufferLength));
+        dprintf(("Dart opened, bufsize = %d\n", MixBuffer[0].ulBufferLength));
 
         wavehdr     = pwh;
@@ -477 +477 @@
   wmutex->enter(VMUTEX_WAIT_FOREVER);
   while(wavehdr) {
-    wavehdr->dwFlags |= WHDR_DONE;
-    wmutex->leave();
-    if(mthdCallback) {
-        callback((ULONG)this, WOM_DONE, dwInstance, (ULONG)wavehdr, 0);
-    }
-    else {
-        if(hwndCallback)
-            PostMessageA(hwndCallback, WOM_DONE, (ULONG)wavehdr, 0);
-    }
-    wmutex->enter(VMUTEX_WAIT_FOREVER);
-    wavehdr = wavehdr->lpNext;
+        wavehdr->dwFlags |= WHDR_DONE;
+        wmutex->leave();
+        if(mthdCallback) {
+                callback((ULONG)this, WOM_DONE, dwInstance, (ULONG)wavehdr, 0);
+        }
+        else 
+        if(hwndCallback) {
+                dprintf(("Callback (msg) for buffer %x", wavehdr));
+                PostMessageA(hwndCallback, WOM_DONE, (WPARAM)this, (ULONG)wavehdr);
+        }
+        wmutex->enter(VMUTEX_WAIT_FOREVER);
+        wavehdr = wavehdr->lpNext;
   }
   wavehdr = NULL;
@@ -649 +650 @@
         }
         else
-            if(hwndCallback)
-                PostMessageA(hwndCallback, WOM_DONE, (ULONG)whdr, 0);
+        if(hwndCallback) {
+                dprintf(("Callback (msg) for buffer %x", whdr));
+                PostMessageA(hwndCallback, WOM_DONE, (WPARAM)this, (ULONG)whdr);
+        }
 
         wmutex->enter(VMUTEX_WAIT_FOREVER);