Changeset 8572 for trunk/src

Timestamp:

Jun 5, 2002, 1:05:56 PM (23 years ago)

Author:

sandervl

Message:

Postpone recording when waveInStart called without any buffers in the queue. Start in during next waveInAddBuffer call

Location:

trunk/src/winmm

Files:

• waveindart.cpp (modified) (13 diffs)
• waveinoutbase.h (modified) (2 diffs)

trunk/src/winmm/waveindart.cpp

@@ -1 @@
-/* $Id: waveindart.cpp,v 1.4 2002-05-28 14:09:25 sandervl Exp $ */
+/* $Id: waveindart.cpp,v 1.5 2002-06-05 11:05:56 sandervl Exp $ */
 
 /*
@@ -77 +77 @@
     AmpOpenParms.pszDeviceType = ( PSZ ) MCI_DEVTYPE_AUDIO_AMPMIX;
 
-    rc = mymciSendCommand(0, MCI_OPEN,
-                       MCI_WAIT | MCI_OPEN_TYPE_ID | MCI_OPEN_SHAREABLE,
-                       (PVOID) &AmpOpenParms,
-                       0);
+    rc = mymciSendCommand(0, MCI_OPEN, MCI_WAIT | MCI_OPEN_TYPE_ID | MCI_OPEN_SHAREABLE,
+                          (PVOID) &AmpOpenParms, 0);
     DeviceId = AmpOpenParms.usDeviceID;
     if(rc) {
@@ -144 +142 @@
 /******************************************************************************/
 /******************************************************************************/
-/******************************************************************************/
-/******************************************************************************/
 MMRESULT DartWaveIn::start()
 {
- MCI_GENERIC_PARMS    GenericParms = {0};
- MCI_AMP_OPEN_PARMS   AmpOpenParms;
- MCI_CONNECTOR_PARMS  ConnectorParms;
- MCI_AMP_SET_PARMS    AmpSetParms ;
- APIRET rc;
- int i, curbuf, buflength;
+    MCI_GENERIC_PARMS    GenericParms = {0};
+    MCI_AMP_OPEN_PARMS   AmpOpenParms;
+    MCI_CONNECTOR_PARMS  ConnectorParms;
+    MCI_AMP_SET_PARMS    AmpSetParms ;
+    APIRET rc;
+    int i, curbuf, buflength;
 
     dprintf(("DartWaveIn::start"));
     if(State == STATE_RECORDING)
         return(MMSYSERR_NOERROR);
+
+    //if the app hasn't yet given us any buffers, then we can't possibly determine the
+    //right buffer size for DART recording, so postpone recording until the
+    //first buffer has been added
+    if(wavehdr == NULL) {
+        wmutex.enter();
+        State = STATE_POSTPONE_RECORDING;
+        wmutex.leave();
+        return MMSYSERR_NOERROR;
+    }
 
     if(fMixerSetup == FALSE)
@@ -180 +186 @@
         MixSetupParms->pmixEvent    = WaveInHandler;
 
-        rc = mymciSendCommand(DeviceId,
-                            MCI_MIXSETUP,
-                            MCI_WAIT | MCI_MIXSETUP_INIT,
-                            (PVOID)MixSetupParms,
-                            0);
+        rc = mymciSendCommand(DeviceId, MCI_MIXSETUP, MCI_WAIT | MCI_MIXSETUP_INIT,
+                              (PVOID)MixSetupParms, 0);
 
         if ( rc != MCIERR_SUCCESS ) {
@@ -208 +211 @@
 
             ulBufSize = pwh->dwBufferLength/2;
-            if(ulBufSize < minbufsize) {
+            if(ulBufSize > minbufsize) {
                 dprintf(("set buffer size to %d bytes (org size = %d)", minbufsize, pwh->dwBufferLength));
                 ulBufSize = minbufsize;
@@ -243 +246 @@
         memset( &ConnectorParms, '\0', sizeof( MCI_CONNECTOR_PARMS ) );
         ConnectorParms.ulConnectorType = MCI_LINE_IN_CONNECTOR;
-        rc = mymciSendCommand( DeviceId,
-                             MCI_CONNECTOR,
-                             MCI_WAIT |
-                             MCI_ENABLE_CONNECTOR |
-                             MCI_CONNECTOR_TYPE,
-                             ( PVOID ) &ConnectorParms,
-                             0 );
+        rc = mymciSendCommand(DeviceId, MCI_CONNECTOR, MCI_WAIT |
+                              MCI_ENABLE_CONNECTOR | MCI_CONNECTOR_TYPE,
+                              ( PVOID ) &ConnectorParms, 0 );
 
         /* Allow the user to hear what is being recorded
@@ -272 +271 @@
 
     dprintf(("MixSetupParms = %X\n", MixSetupParms));
-    State     = STATE_RECORDING;
+    State    = STATE_RECORDING;
     fOverrun = FALSE;
     wmutex.leave();
@@ -279 +278 @@
 
     // Start recording.
-    USHORT selTIB = GetFS(); // save current FS selector
-    MixSetupParms->pmixRead( MixSetupParms->ulMixHandle,
-                             &MixBuffer[0],
-                             PREFILLBUF_DART_REC);
+    USHORT selTIB = RestoreOS2FS(); // save current FS selector
+    MixSetupParms->pmixRead(MixSetupParms->ulMixHandle, &MixBuffer[0], PREFILLBUF_DART_REC);
     SetFS(selTIB);           // switch back to the saved FS selector
 
@@ -291 +288 @@
 MMRESULT DartWaveIn::stop()
 {
- MCI_GENERIC_PARMS Params;
+    MCI_GENERIC_PARMS Params;
 
     wmutex.enter();
@@ -314 +311 @@
 MMRESULT DartWaveIn::reset()
 {
- MCI_GENERIC_PARMS Params;
- LPWAVEHDR tmpwavehdr;
+    MCI_GENERIC_PARMS Params;
+    LPWAVEHDR tmpwavehdr;
 
     dprintf(("DartWaveIn::reset %s", (State == STATE_RECORDING) ? "recording" : "stopped"));
-    if(State != STATE_RECORDING)
+    
+    wmutex.enter();
+    if(State == STATE_POSTPONE_RECORDING) {
+        dprintf(("reset postponed recording"));
+        State = STATE_STOPPED;
+        wmutex.leave();
+        return MMSYSERR_NOERROR;
+    }
+    if(State != STATE_RECORDING) {
+        wmutex.leave();
         return(MMSYSERR_HANDLEBUSY);
+    }
+    wmutex.leave();
 
     memset(&Params, 0, sizeof(Params));
@@ -352 +360 @@
 MMRESULT DartWaveIn::addBuffer(LPWAVEHDR pwh, UINT cbwh)
 {
- int i;
+    int i;
 
     wmutex.enter();
@@ -367 +375 @@
     wmutex.leave();
 
+    if(State == STATE_POSTPONE_RECORDING) {
+        //if recording was postponed due to lack of buffers, then start now
+        start();
+    }
     return(MMSYSERR_NOERROR);
 }
@@ -552 +564 @@
     //Transfer buffer to DART
     // MCI_MIXSETUP_PARMS->pMixWrite does alter FS: selector!
-    USHORT selTIB = GetFS(); // save current FS selector
+    USHORT selTIB = RestoreOS2FS(); // save current FS selector
     MixSetupParms->pmixRead(MixSetupParms->ulMixHandle, pBuffer, 1);
     SetFS(selTIB);           // switch back to the saved FS selector

trunk/src/winmm/waveinoutbase.h

@@ -1 @@
-/* $Id: waveinoutbase.h,v 1.1 2001-03-23 16:23:45 sandervl Exp $ */
+/* $Id: waveinoutbase.h,v 1.2 2002-06-05 11:05:56 sandervl Exp $ */
 
 /*
@@ -11 +11 @@
 #define __WAVEINOUTBASE_H__
 
-#define STATE_STOPPED   0
-#define STATE_PLAYING   1
-#define STATE_PAUSED    2
-#define STATE_RECORDING 3
+#define STATE_STOPPED               0
+#define STATE_PLAYING               1
+#define STATE_PAUSED                2
+#define STATE_RECORDING             3
+#define STATE_POSTPONE_RECORDING    4
 
 #ifdef OS2_ONLY