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

Timestamp:

Mar 5, 2003, 3:49:04 PM (22 years ago)

Author:

sandervl

Message:

waveoutGetPosition: return 0 if stream is not active (DART); waveinGetPosition: return 0 if stream is not active (DART); Don't print a warning for CALLBACK_NULL callbacks; Added ODIN_waveInSetFixedBuffers, renamed SetFixedWaveBufferSize to ODIN_waveOutSetFixedBuffers. Used to tell WINMM to use the waveOutWrite buffer size for the DART buffers

File:

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

trunk/src/winmm/waveindart.cpp

@@ -1 @@
-/* $Id: waveindart.cpp,v 1.5 2002-06-05 11:05:56 sandervl Exp $ */
+/* $Id: waveindart.cpp,v 1.6 2003-03-05 14:49:04 sandervl Exp $ */
 
 /*
@@ -6 +6 @@
  * Copyright 2001 Sander van Leeuwen (sandervl@xs4all.nl)
  *
+ * TODO: mulaw, alaw & adpcm
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -46 +47 @@
 LONG APIENTRY WaveInHandler(ULONG ulStatus, PMCI_MIX_BUFFER pBuffer, ULONG ulFlags);
 
-//TODO: mulaw, alaw & adpcm
+static BOOL fwaveInFixedBuffers = FALSE;
+
+//******************************************************************************
+// ODIN_waveInSetFixedBuffers
+//
+// Tell WINMM to use DART buffers of the same size as the first buffer delivered
+// by waveInAddBuffer
+//
+//******************************************************************************
+void WIN32API ODIN_waveInSetFixedBuffers()
+{
+    fwaveInFixedBuffers = TRUE;
+}
 /******************************************************************************/
 /******************************************************************************/
@@ -208 +221 @@
         LPWAVEHDR pwh = wavehdr;
         if(pwh) {
-            dprintf(("mix setup %d, %d\n", pwh->dwBufferLength, pwh->dwBufferLength));
-
-            ulBufSize = pwh->dwBufferLength/2;
+            if(fwaveInFixedBuffers) {
+                ulBufSize = pwh->dwBufferLength;
+            }
+            else 
+            {
+                dprintf(("mix setup %d, %d\n", pwh->dwBufferLength, pwh->dwBufferLength));
+    
+                ulBufSize = pwh->dwBufferLength/2;
+            }
             if(ulBufSize > minbufsize) {
                 dprintf(("set buffer size to %d bytes (org size = %d)", minbufsize, pwh->dwBufferLength));
@@ -388 +407 @@
     ULONG rc, nrbytes;
 
+    if(State == STATE_STOPPED) {
+        dprintf(("Not recording; return 0 position"));
+        return 0;
+    }
+
     mciStatus.ulItem = MCI_STATUS_POSITION;
     rc = mymciSendCommand(DeviceId, MCI_STATUS, MCI_STATUS_ITEM|MCI_WAIT, (PVOID)&mciStatus, 0);