Changeset 9902 for trunk/src/winmm/waveoutdart.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/waveoutdart.cpp (modified) (4 diffs)

trunk/src/winmm/waveoutdart.cpp

@@ -1 @@
-/* $Id: waveoutdart.cpp,v 1.15 2002-08-16 10:09:49 sandervl Exp $ */
+/* $Id: waveoutdart.cpp,v 1.16 2003-03-05 14:49:04 sandervl Exp $ */
 
 /*
@@ -53 +53 @@
 static BOOL fFixedWaveBufferSize = FALSE;
 
-/******************************************************************************/
-//Call to tell winmm to expect simple fixed size buffers, so
-//it doesn't have to use very small DART buffers; this will
-//only work in very specific cases; it is not a good general
-//purpose solution)
-/******************************************************************************/
-void WIN32API SetFixedWaveBufferSize()
+//******************************************************************************
+// ODIN_waveOutSetFixedBuffers
+//
+// Tell WINMM to use DART buffers of the same size as the first buffer delivered
+// by waveOutWrite
+//
+// NOTE: This will only work in very specific cases; it is not a good general
+//       purpose solution.
+// 
+//******************************************************************************
+void WIN32API ODIN_waveOutSetFixedBuffers();
 {
     fFixedWaveBufferSize = TRUE;
@@ -224 +228 @@
         else    ulBufSize = 1024;
 #endif
-
         MixSetupParms->ulBufferSize = ulBufSize;
 
@@ -467 +470 @@
  ULONG rc, nrbytes;
 
+    if(State == STATE_STOPPED) {
+        dprintf(("Not playing; return 0 position"));
+        return 0;
+    }
+
     mciStatus.ulItem = MCI_STATUS_POSITION;
     rc = mymciSendCommand(DeviceId, MCI_STATUS, MCI_STATUS_ITEM|MCI_WAIT, (PVOID)&mciStatus, 0);