Changeset 120 for trunk

Timestamp:

Sep 2, 2006, 8:01:56 PM (19 years ago)

Author:

dmik

Message:

Kernel: QSound: Added a workaround to solve 100% CPU load followed by UI freeze when playing too many sounds simultaneously (most likely caused by badly written single-streamed audio card drivers, such as ESS688): when the QT_PM_NO_SOUND_SHARE variable is defined in the environment, Qt will open sound devices in exclusive mode instead of shared.

File:

• trunk/src/kernel/qsound_pm.cpp (modified) (2 diffs)

trunk/src/kernel/qsound_pm.cpp

@@ -49 +49 @@
 #include <qt_os2.h>
 
-//#define QT_QSOUND_DEBUG
+#include <stdlib.h> // for getenv()
+
+#define QT_QSOUND_DEBUG
 
 // local QT_DEBUG override, must be placed *after* all includes
@@ -403 +405 @@
     openParams.pszDeviceType = (PSZ) MAKEULONG( MCI_DEVTYPE_WAVEFORM_AUDIO, 0 );
     openParams.pszElementName = (PSZ) fileHandle;
-    ULONG rc = mciSendCommand( 0, MCI_OPEN, MCI_WAIT | MCI_OPEN_MMIO | MCI_READONLY |
-                                  MCI_OPEN_SHAREABLE | MCI_OPEN_TYPE_ID,
-                               &openParams, 0 );                
+    ULONG params = MCI_WAIT | MCI_OPEN_MMIO | MCI_READONLY | MCI_OPEN_TYPE_ID;
+        if ( getenv( "QT_PM_NO_SOUND_SHARE" ) != NULL ) {
+#if defined(QT_DEBUG)
+        qDebug( "QAuBucketMMPM: WARNING: opening device for sound file [%s] in "
+                                "exclusive mode due to QT_PM_NO_SOUND_SHARE=%s",
+                                fName.data(), getenv( "QT_PM_NO_SOUND_SHARE" ) );
+#endif
+        } else {
+                params |= MCI_OPEN_SHAREABLE;
+        }
+    ULONG rc = mciSendCommand( 0, MCI_OPEN, params, &openParams, 0 );                
     if ( rc != MCIERR_SUCCESS ) {
 #if defined(QT_DEBUG)