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

Timestamp:

Oct 27, 1999, 12:44:15 AM (26 years ago)

Author:

phaller

Message:

Fix: invalid callback check fixed

File:

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

trunk/src/winmm/dwaveout.cpp

@@ -1 @@
-/* $Id: dwaveout.cpp,v 1.8 1999-10-22 18:09:15 sandervl Exp $ */
+/* $Id: dwaveout.cpp,v 1.9 1999-10-26 22:44:15 phaller Exp $ */
 
 /*
@@ -220 +220 @@
 
    if(!ulError) {
-        if(callback) {
+        if(mthdCallback) {
                 callback((ULONG)this, WOM_CLOSE, dwInstance, 0, 0);
         }
@@ -272 +272 @@
    // Close the device
    mciSendCommand(AmpOpenParms.usDeviceID, MCI_CLOSE, MCI_WAIT, (PVOID)&GenericParms, 0);
-   
+
    return 1;
 }
@@ -479 +479 @@
     wavehdr->dwFlags |= WHDR_DONE;
     wmutex->leave();
-    if(callback) {
+    if(mthdCallback) {
         callback((ULONG)this, WOM_DONE, dwInstance, wavehdr->dwUser, (ULONG)wavehdr);
     }
@@ -634 +634 @@
         wmutex->leave();
 
-        if(callback) {
+        dprintf(("WINMM:DartWaveOut::handler callback=%08xh\n",
+                 callback));
+        if(mthdCallback) {
             callback((ULONG)this, WOM_DONE, dwInstance, whdr->dwUser, (ULONG)whdr);
         }