Changeset 561 for trunk/src/3rdparty/phonon/ds9/backend.h

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/phonon/ds9/backend.h (modified) (3 diffs)

trunk/src/3rdparty/phonon/ds9/backend.h

@@ -24 +24 @@
 
 #include <QtCore/QList>
+#include <QtCore/QMutex>
 
 #include "compointer.h"
@@ -64 +65 @@
             Filter getAudioOutputFilter(int index) const;
 
+            static QMutex *directShowMutex;
+
         Q_SIGNALS:
             void objectDescriptionChanged(ObjectDescriptionType);
@@ -75 +78 @@
             mutable QVector<AudioMoniker> m_audioOutputs;
             mutable QVector<CLSID> m_audioEffects;
+            mutable QMutex m_directShowMutex;
         };
     }