Phonon/ds9: fix a potential dead-lock found by user

This is following merge request 878. A customer was able to get a dead-
lock when calling at the same time RenderFile and enumerating the audio
devices. We now have a global mutex for that.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/3rdparty/phonon/ds9/backend.h b/src/3rdparty/phonon/ds9/backend.h
index ad638f2..9b2c2a2 100644
--- a/src/3rdparty/phonon/ds9/backend.h
+++ b/src/3rdparty/phonon/ds9/backend.h
@@ -23,6 +23,7 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include <phonon/phononnamespace.h>
 
 #include <QtCore/QList>
+#include <QtCore/QMutex>
 
 #include "compointer.h"
 #include "backendnode.h"
@@ -63,6 +64,8 @@ namespace Phonon
 
             Filter getAudioOutputFilter(int index) const;
 
+            static QMutex *Backend::directShowMutex();
+
         Q_SIGNALS:
             void objectDescriptionChanged(ObjectDescriptionType);
 
@@ -74,6 +77,7 @@ namespace Phonon
             };
             mutable QVector<AudioMoniker> m_audioOutputs;
             mutable QVector<CLSID> m_audioEffects;
+            mutable QMutex m_directShowMutex;
         };
     }
 }