Changeset 5487 for trunk/src/winmm/waveoutdaud.cpp

Timestamp:

Apr 6, 2001, 4:36:43 PM (24 years ago)

Author:

sandervl

Message:

cleanup daudio thread properly

File:

• trunk/src/winmm/waveoutdaud.cpp (modified) (8 diffs)

trunk/src/winmm/waveoutdaud.cpp

@@ -1 @@
-/* $Id: waveoutdaud.cpp,v 1.3 2001-03-25 21:53:05 sandervl Exp $ */
+/* $Id: waveoutdaud.cpp,v 1.4 2001-04-06 14:36:43 sandervl Exp $ */
 
 /*
@@ -53 +53 @@
     fUnderrun = FALSE;
     hSem      = 0;
-    setVolume(volume);
 
     rc = DosOpen("DAUDIO1$", &hDAudioDrv, &action, 0,
@@ -102 +101 @@
     hThread = CreateThread(NULL, 0x4000, (LPTHREAD_START_ROUTINE)DAudioThreadHandler,
                            (LPVOID)this, 0, &dwThreadID);
+
+    setVolume(volume);
 
     if(!ulError)
@@ -126 +127 @@
     }
     if(hSem) {
+        DosPostEventSem(hSem);
         DosCloseEventSem(hSem);
     }
@@ -394 +396 @@
 //      always notify the win32 app for each buffer that was processed)
 /******************************************************************************/
-void DAudioWaveOut::handler()
+BOOL DAudioWaveOut::handler()
 {
  LPWAVEHDR whdr = wavehdr;
 
     dprintf2(("WINMM: handler buf %X done (play %d/%d, cop %d, ret %d)", whdr, bytesPlayed, getPosition(), bytesCopied, bytesReturned));
+
+    if(State != STATE_PLAYING || whdr == NULL)
+        return FALSE;
 
     wmutex.enter();
@@ -412 +417 @@
 
     callback(WOM_DONE, (ULONG)whdr, 0);
+    return TRUE;
 }
 /******************************************************************************/
@@ -420 +426 @@
  ULONG  postcnt;
  HEV    hSem;
+ BOOL   fResult = TRUE;
 
     DAudioWaveOut *dwave = (DAudioWaveOut *)pUserData;
@@ -445 +452 @@
             return 0;
         }
+        if(WaveOut::find(dwave) == FALSE) {
+            dprintf(("DAudioThreadHandler: can't find waveout stream %x", pUserData));
+            break;
+        }
         for(int i=0;i<postcnt;i++) {
-            dwave->handler();
-        }
-    }
-
-}
-/******************************************************************************/
-/******************************************************************************/
-
+            fResult = dwave->handler();
+            if(fResult == FALSE) {
+                break;
+            }
+        }
+        if(fResult == FALSE) {
+            dprintf(("DAudioThreadHandler: finished waveout stream %x", pUserData));
+            break;
+        }
+    }
+    return 0;
+}
+/******************************************************************************/
+/******************************************************************************/
+