Changeset 19495

Timestamp:

Jul 31, 2002, 3:51:21 PM (23 years ago)

Author:

sandervl

Message:

Custom build function SetFixedWaveBufferSize added

Location:

tags/trunk

Files:

• include/custombuild.h (modified) (1 diff)
• src/winmm/waveoutdart.cpp (modified) (4 diffs)

tags/trunk/include/custombuild.h ¶

@@ -88 +88 @@
 void WIN32API DisableWaveAudio();
 
+//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();
+
 //Override shared semaphore name used to synchronize global window handle 
 //array access (to avoid name clash with Odin)

tags/trunk/src/winmm/waveoutdart.cpp ¶

@@ -1 @@
-/* $Id: waveoutdart.cpp,v 1.10 2002-06-05 11:44:11 sandervl Exp $ */
+/* $Id: waveoutdart.cpp,v 1.11 2002-07-31 13:51:21 sandervl Exp $ */
 
 /*
@@ -11 +11 @@
  * Note:
  * 2000/11/24 PH MCI_MIXSETUP_PARMS->pMixWrite does alter FS: selector!
+ * TODO: mulaw, alaw & adpcm
  *
  */
@@ -50 +51 @@
 LONG APIENTRY WaveOutHandler(ULONG ulStatus, PMCI_MIX_BUFFER pBuffer, ULONG ulFlags);
 
-//TODO: mulaw, alaw & adpcm
+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()
+{
+    fFixedWaveBufferSize = TRUE;
+}
 /******************************************************************************/
 /******************************************************************************/
@@ -194 +206 @@
 
 #if 1
-        int consumerate = getAvgBytesPerSecond();
-        int minbufsize = consumerate/32;
-
-        ulBufSize = pwh->dwBufferLength/2;
-        if(ulBufSize > minbufsize) {
-            dprintf(("set buffer size to %d bytes (org size = %d)", minbufsize, pwh->dwBufferLength));
-            ulBufSize = minbufsize;
-        }
+        if(fFixedWaveBufferSize == FALSE) 
+        {//by default we need to select a small enough buffer to be able to
+         //signal buffer completion in time 
+            int consumerate = getAvgBytesPerSecond();
+            int minbufsize = consumerate/32;
+
+            ulBufSize = pwh->dwBufferLength/2;
+            if(ulBufSize > minbufsize) {
+                dprintf(("set buffer size to %d bytes (org size = %d)", minbufsize, pwh->dwBufferLength));
+                ulBufSize = minbufsize;
+            }
+        }
+        else ulBufSize = pwh->dwBufferLength;
 #else
         if(pwh->dwBufferLength >= 512 && pwh->dwBufferLength <= 1024)