Changeset 9979 for trunk/src

Timestamp:

Apr 3, 2003, 3:07:04 PM (23 years ago)

Author:

sandervl

Message:

Different method for detecting DirectAudio (uniaud, sblive, c-media) ; Added custom build function to disable DirectAudio (always use DART)

Location:

trunk/src/winmm

Files:

• waveoutdart.cpp (modified) (3 diffs)
• waveoutdaud.cpp (modified) (8 diffs)

trunk/src/winmm/waveoutdart.cpp

@@ -1 @@
-/* $Id: waveoutdart.cpp,v 1.20 2003-03-06 18:18:56 sandervl Exp $ */
+/* $Id: waveoutdart.cpp,v 1.21 2003-04-03 13:07:03 sandervl Exp $ */
 
 /*
@@ -509 +509 @@
     rc = mymciSendCommand(DeviceId, MCI_STATUS, MCI_STATUS_ITEM|MCI_WAIT, (PVOID)&mciStatus, 0);
     if((rc & 0xFFFF) == MCIERR_SUCCESS) {
-        nrbytes = (ULONG)((double)mciStatus.ulReturn * ((double)getAvgBytesPerSecond()/1000.0));
+        nrbytes = (ULONG)(((double)mciStatus.ulReturn * (double)getAvgBytesPerSecond())/1000.0);
         return nrbytes;;
     }
@@ -742 +742 @@
 
     ptib2 = (PTIB2)_getTIBvalue(offsetof(TIB, tib_ptib2));
-    if(ptib2 && HIBYTE(ptib2->tib2_ulpri) != PRTYC_TIMECRITICAL) {
-        dprintf(("Setting priority of DART thread to PRTYC_TIMECRITICAL"));
-        DosSetPriority(PRTYS_THREAD, PRTYC_TIMECRITICAL, 0, 0);
+    if(ptib2 && HIBYTE(ptib2->tib2_ulpri) != PRTYC_TIMECRITICAL && 
+       LOBYTE(ptib2->tib2_ulpri) != PRTYD_MAXIMUM) 
+    {
+        dprintf(("Setting priority of DART thread to PRTYC_TIMECRITICAL/PRTYD_MAXIMUM"));
+        DosSetPriority(PRTYS_THREAD, PRTYC_TIMECRITICAL, PRTYD_MAXIMUM, 0);
     }
     if(pBuffer && pBuffer->ulUserParm)

trunk/src/winmm/waveoutdaud.cpp

@@ -1 @@
-/* $Id: waveoutdaud.cpp,v 1.8 2002-06-04 17:36:56 sandervl Exp $ */
+/* $Id: waveoutdaud.cpp,v 1.9 2003-04-03 13:07:04 sandervl Exp $ */
 
 /*
  * Wave playback class (DirectAudio)
  *
- * Copyright 2001 Sander van Leeuwen (sandervl@xs4all.nl)
+ * Copyright 2001-2003 Sander van Leeuwen (sandervl@xs4all.nl)
  *
+ * TODO: mulaw, alaw & adpcm
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -33 +34 @@
 #include "misc.h"
 #include "waveoutdaud.h"
+#include "mixeros2.h"
 
 #define DBG_LOCALLOG    DBG_waveoutdaud
@@ -39 +41 @@
 DWORD WIN32API DAudioThreadHandler(LPVOID pUserData);
 
-//TODO: mulaw, alaw & adpcm
+static char szPDDName[128] = "\\DEV\\";
+static BOOL fUseDirectAudio = TRUE;
+
+/******************************************************************************/
+//Turn off usage of the Uniaud DirectAudio interface
+/******************************************************************************/
+void WIN32API DisableDirectAudio()
+{
+    dprintf(("DisableDirectAudio"));
+    fUseDirectAudio = FALSE;
+}
 /******************************************************************************/
 /******************************************************************************/
@@ -55 +67 @@
     hSem      = 0;
 
-    rc = DosOpen("DAUDIO1$", &hDAudioDrv, &action, 0,
+    dprintf(("DAudioWaveOut::DAudioWaveOut"));
+
+    rc = DosOpen(szPDDName, &hDAudioDrv, &action, 0,
                  FILE_NORMAL, FILE_OPEN, OPEN_ACCESS_READWRITE |
                  OPEN_SHARE_DENYNONE | OPEN_FLAGS_WRITE_THROUGH,
@@ -286 +300 @@
     HFILE           hDriver;
 
-    rc = DosOpen("DAUDIO1$", &hDriver, &action, 0,
+    rc = DosOpen(szPDDName, &hDriver, &action, 0,
                  FILE_NORMAL, FILE_OPEN, OPEN_ACCESS_READWRITE |
                  OPEN_SHARE_DENYNONE | OPEN_FLAGS_WRITE_THROUGH,
@@ -331 +345 @@
     HFILE           hDriver;
 
+    if(!fUseDirectAudio) return FALSE;
+
     if(!fTested) {
         if(PROFILE_GetOdinIniInt(SECTION_WINMM, KEY_DIRECTAUDIO, 1) == 0) {
@@ -336 +352 @@
             return FALSE;
         }
-        rc = DosOpen("DAUDIO1$", &hDriver, &action, 0,
+
+        if(OSLibGetAudioPDDName(&szPDDName[5]) == FALSE) {
+            return FALSE;
+        }
+
+        dprintf(("OSLibMixerOpen: PDD name %s", szPDDName));
+        rc = DosOpen(szPDDName, &hDriver, &action, 0,
                      FILE_NORMAL, FILE_OPEN, OPEN_ACCESS_READWRITE |
                      OPEN_SHARE_DENYNONE | OPEN_FLAGS_WRITE_THROUGH,
@@ -348 +370 @@
     }
     return fAvailable;
-
 }
 /******************************************************************************/