Changeset 5334 for trunk/src/winmm/dwavein.cpp

Timestamp:

Mar 19, 2001, 8:28:39 PM (24 years ago)

Author:

sandervl

Message:

many wave playback & recording fixes

File:

• trunk/src/winmm/dwavein.cpp (modified) (14 diffs)

trunk/src/winmm/dwavein.cpp

@@ -1 @@
-/* $Id: dwavein.cpp,v 1.1 2001-02-27 21:13:59 sandervl Exp $ */
+/* $Id: dwavein.cpp,v 1.2 2001-03-19 19:28:38 sandervl Exp $ */
 
 /*
@@ -54 +54 @@
 /******************************************************************************/
 /******************************************************************************/
-DartWaveIn::DartWaveIn(LPWAVEFORMATEX pwfx, ULONG nCallback, ULONG dwInstance, USHORT usSel)
+DartWaveIn::DartWaveIn(LPWAVEFORMATEX pwfx, ULONG nCallback, ULONG dwInstance)
 {
    Init(pwfx);
 
    mthdCallback     = (LPDRVCALLBACK)nCallback; // callback function
-   selCallback      = usSel;                    // callback win32 tib selector
    this->dwInstance = dwInstance;
    fOverrun        = FALSE;
@@ -82 +81 @@
 {
   USHORT selTIB = GetFS(); // save current FS selector
+  USHORT selCallback;
 
     dprintf(("WINMM:DartWaveIn::callback(HDRVR h=%08xh, UINT uMessage=%08xh, DWORD dwUser=%08xh, DWORD dw1=%08xh, DWORD dw2=%08xh)\n",
               h, uMessage, dwUser, dw1, dw2));
 
-    if (selCallback != 0)
-        SetFS(selCallback);      // switch to callback win32 tib selector (stored in waveInOpen)
-    else
-        dprintf(("WINMM:DartWaveIn::callback - selCallback is invalid"));
-
-    //@@@PH 1999/12/28 Shockwave Flashes seem to make assumptions on a
-    // specific stack layout. Do we have the correct calling convention here?
-    mthdCallback(h,uMessage,dwUser,dw1,dw2);
-    SetFS(selTIB);           // switch back to the saved FS selector
+    selCallback = GetProcessTIBSel();
+
+    //TODO: may not be very safe. perhaps we should allocate a new TIB for the DART thread or let another thread do the actual callback
+    if(selCallback)
+    {
+        SetFS(selCallback);      // switch to callback win32 tib selector (stored in waveOutOpen)
+
+        //@@@PH 1999/12/28 Shockwave Flashes seem to make assumptions on a
+        // specific stack layout. Do we have the correct calling convention here?
+        mthdCallback(h,uMessage,dwUser,dw1,dw2);
+        SetFS(selTIB);           // switch back to the saved FS selector
+    }
+    else {
+        dprintf(("WARNING: no valid selector of main thread available (process exiting); skipping waveout notify"));
+    }
+    dprintf(("WINMM:DartWaveOut::callback returned"));
 }
 /******************************************************************************/
@@ -109 +116 @@
    mthdCallback  = NULL;
    hwndCallback  = 0;
-   selCallback   = 0;
    dwInstance    = 0;
    ulError       = 0;
-   selCallback   = 0;
    State         = STATE_STOPPED;
 
@@ -450 +455 @@
 {
  MCI_GENERIC_PARMS Params;
-
-  dprintf(("DartWaveIn::reset %s", (State == STATE_RECORDING) ? "recording" : "stopped"));
-  if(State != STATE_RECORDING)
+ LPWAVEHDR tmpwavehdr;
+
+    dprintf(("DartWaveIn::reset %s", (State == STATE_RECORDING) ? "recording" : "stopped"));
+    if(State != STATE_RECORDING)
         return(MMSYSERR_HANDLEBUSY);
 
-  memset(&Params, 0, sizeof(Params));
-
-  // Stop recording
-  mciSendCommand(DeviceId, MCI_STOP, MCI_WAIT, (PVOID)&Params, 0);
-
-  dprintf(("Nr of threads blocked on mutex = %d\n", wmutex->getNrBlocked()));
-
-  wmutex->enter(VMUTEX_WAIT_FOREVER);
-  while(wavehdr)
-  {
+    memset(&Params, 0, sizeof(Params));
+
+    // Stop recording
+    mciSendCommand(DeviceId, MCI_STOP, MCI_WAIT, (PVOID)&Params, 0);
+
+    dprintf(("Nr of threads blocked on mutex = %d\n", wmutex->getNrBlocked()));
+
+    wmutex->enter(VMUTEX_WAIT_FOREVER);
+    while(wavehdr)
+    {
         wavehdr->dwFlags |= WHDR_DONE;
         wavehdr->dwFlags &= ~WHDR_INQUEUE;
-        wavehdr = wavehdr->lpNext;
-        wavehdr->lpNext = NULL;
+        tmpwavehdr         = wavehdr;
+        wavehdr            = wavehdr->lpNext;
+        tmpwavehdr->lpNext = NULL;
 
         wmutex->leave();
         if(mthdCallback) {
-            callback((ULONG)this, WIM_DATA, dwInstance, (ULONG)wavehdr, 0);
+            callback((ULONG)this, WIM_DATA, dwInstance, (ULONG)tmpwavehdr, 0);
         }
         else
         if(hwndCallback) {
             dprintf(("Callback (msg) for buffer %x", wavehdr));
-            PostMessageA(hwndCallback, WIM_DATA, (WPARAM)this, (ULONG)wavehdr);
+            PostMessageA(hwndCallback, WIM_DATA, (WPARAM)this, (ULONG)tmpwavehdr);
         }
         wmutex->enter(VMUTEX_WAIT_FOREVER);
-  }
-  wavehdr   = NULL;
-  State     = STATE_STOPPED;
-  fOverrun = FALSE;
-
-  wmutex->leave();
-  return(MMSYSERR_NOERROR);
+    }
+    wavehdr   = NULL;
+    State     = STATE_STOPPED;
+    fOverrun = FALSE;
+
+    wmutex->leave();
+    return(MMSYSERR_NOERROR);
 }
 /******************************************************************************/
@@ -495 +502 @@
 
     wmutex->enter(VMUTEX_WAIT_FOREVER);
-    pwh->lpNext   = NULL;
+    pwh->lpNext          = NULL;
     pwh->dwBytesRecorded = 0;
     if(wavehdr) {
@@ -585 +592 @@
 {
 #ifdef DEBUG
- char szError[256] = "";
-
-  mciGetErrorString(ulError, szError, sizeof(szError));
-  dprintf(("WINMM: DartWaveIn: %s\n", szError));
+    char szError[256] = "";
+
+    mciGetErrorString(ulError, szError, sizeof(szError));
+    dprintf(("WINMM: DartWaveIn: %s\n", szError));
 #endif
 }
@@ -595 +602 @@
 BOOL DartWaveIn::find(DartWaveIn *dwave)
 {
- DartWaveIn *curwave = wavein;
-
-  while(curwave) {
-    if(dwave == curwave) {
-        return(TRUE);
-    }
-    curwave = curwave->next;
-  }
-
-#ifdef DEBUG
-//  WriteLog("WINMM:DartWaveIn not found!\n");
-#endif
-  return(FALSE);
+    DartWaveIn *curwave = wavein;
+
+    while(curwave) {
+        if(dwave == curwave) {
+            return(TRUE);
+        }
+        curwave = curwave->next;
+    }
+
+    dprintf2(("WINMM:DartWaveIn not found!"));
+    return(FALSE);
 }
 /******************************************************************************/
@@ -619 +624 @@
  WAVEHDR *whdr, *prevhdr = NULL;
 
-#ifdef DEBUG1
-    dprintf(("WINMM: DartWaveIn handler %x\n", pBuffer));
-#endif
+    dprintf2(("WINMM: DartWaveIn handler %x\n", pBuffer));
     if(ulFlags == MIX_STREAM_ERROR) {
         if(ulStatus == ERROR_DEVICE_OVERRUN) {
@@ -627 +630 @@
             if(State == STATE_RECORDING) {
                 fOverrun = TRUE;
-                stop();    //out of buffers, so pause playback
+                stop();    //out of buffers, so stop playback
             }
             return;
@@ -644 +647 @@
         return;
     }
-
-#ifdef DEBUG1
-    dprintf(("WINMM: DartWaveIn handler cur (%d,%d), fill (%d,%d)\n", curPlayBuf, curPlayPos, curFillBuf, curFillPos));
-#endif
 
     buflength = pBuffer->ulBufferLength;
@@ -663 +662 @@
             buflength                -= bytestocopy;
 
-            if(wavehdr->dwBytesRecorded == wavehdr->dwBufferLength) {
-#ifdef DEBUG1
-                dprintf(("WINMM: DartWaveIn handler buf %X done\n", whdr));
-#endif
+            if(wavehdr->dwBytesRecorded == wavehdr->dwBufferLength)
+            {
+                dprintf2(("WINMM: DartWaveIn handler buf %X done\n", whdr));
                 whdr->dwFlags |= WHDR_DONE;
                 whdr->dwFlags &= ~WHDR_INQUEUE;
@@ -675 +673 @@
 
                 if(mthdCallback) {
-                    callback((ULONG)this, WIM_DATA, dwInstance, (ULONG)whdr, 0);
+                    callback((ULONG)this, WIM_DATA, dwInstance, (ULONG)whdr, whdr->dwBytesRecorded);
                 }
                 else
                 if(hwndCallback) {
-                        dprintf(("Callback (msg) for buffer %x", whdr));
-                    PostMessageA(hwndCallback, WIM_DATA, (WPARAM)this, (ULONG)whdr);
-                }
+                    dprintf(("Callback (msg) for buffer %x", whdr));
+                    PostMessageA(hwndCallback, WIM_DATA, (WPARAM)this, (ULONG)whdr);
+                }
                 wmutex->enter(VMUTEX_WAIT_FOREVER);
             }
@@ -701 +699 @@
                             ULONG ulFlags)
 {
-    // PTIB ptib;
-    // PPIB ppib;
-    // DosGetInfoBlocks(&ptib, &ppib);
-    // dprintf(("WaveInHandler: thread %d prio %X", ptib->tib_ptib2->tib2_ultid, ptib->tib_ptib2->tib2_ulpri));
-
     DartWaveIn *dwave;