Changeset 10185 for trunk/src/winmm/waveindart.cpp

Timestamp:

Jul 28, 2003, 1:35:32 PM (22 years ago)

Author:

sandervl

Message:

Updates

File:

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

trunk/src/winmm/waveindart.cpp

@@ -1 @@
-/* $Id: waveindart.cpp,v 1.6 2003-03-05 14:49:04 sandervl Exp $ */
+/* $Id: waveindart.cpp,v 1.7 2003-07-28 11:30:44 sandervl Exp $ */
 
 /*
@@ -262 +262 @@
         //TODO: don't do this here. Select line or mic depending on aux settings
         //(until we really support the mixer extensions anyway)
-        /* Set the connector to 'line in' */
+        /* Set the connector to 'microphone' */
         memset( &ConnectorParms, '\0', sizeof( MCI_CONNECTOR_PARMS ) );
-        ConnectorParms.ulConnectorType = MCI_LINE_IN_CONNECTOR;
+        ConnectorParms.ulConnectorType = MCI_MICROPHONE_CONNECTOR;
         rc = mymciSendCommand(DeviceId, MCI_CONNECTOR, MCI_WAIT |
                               MCI_ENABLE_CONNECTOR | MCI_CONNECTOR_TYPE,
@@ -311 +311 @@
     wmutex.enter();
     if(State != STATE_RECORDING) {
+        dprintf(("Not recording!!"));
         State = STATE_STOPPED;
         wmutex.leave();
@@ -342 +343 @@
         return MMSYSERR_NOERROR;
     }
-    if(State != STATE_RECORDING) {
-        wmutex.leave();
-        return(MMSYSERR_HANDLEBUSY);
-    }
     wmutex.leave();
 
@@ -415 +412 @@
     rc = mymciSendCommand(DeviceId, MCI_STATUS, MCI_STATUS_ITEM|MCI_WAIT, (PVOID)&mciStatus, 0);
     if((rc & 0xFFFF) == MCIERR_SUCCESS) {
-        nrbytes = (mciStatus.ulReturn * (getAvgBytesPerSecond()/1000));
+        nrbytes = (((double)mciStatus.ulReturn * (double)getAvgBytesPerSecond())/1000.0);
         return nrbytes;;
     }