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

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.cpp (modified) (8 diffs)

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

@@ -42 +42 @@
     namespace DS9
     {
+        QMutex *Backend::directShowMutex = 0;
+
         bool Backend::AudioMoniker::operator==(const AudioMoniker &other)
         {
@@ -51 +53 @@
             : QObject(parent)
         {
-                        ::CoInitialize(0);
+            directShowMutex = &m_directShowMutex;
+
+            ::CoInitialize(0);
 
             //registering meta types
@@ -62 +66 @@
             m_audioOutputs.clear();
             m_audioEffects.clear();
-                        ::CoUninitialize();
+            ::CoUninitialize();
+
+            directShowMutex = 0;
         }
 
@@ -132 +138 @@
         QList<int> Backend::objectDescriptionIndexes(Phonon::ObjectDescriptionType type) const
         {
+            QMutexLocker locker(&m_directShowMutex);
             QList<int> ret;
 
@@ -158 +165 @@
                         LPOLESTR str = 0;
                         mon->GetDisplayName(0,0,&str);
-                        const QString name = QString::fromUtf16((unsigned short*)str);
+                        const QString name = QString::fromWCharArray(str);
                                                 ComPointer<IMalloc> alloc;
                                                 ::CoGetMalloc(1, alloc.pparam());
@@ -205 +212 @@
         QHash<QByteArray, QVariant> Backend::objectDescriptionProperties(Phonon::ObjectDescriptionType type, int index) const
         {
+            QMutexLocker locker(&m_directShowMutex);
             QHash<QByteArray, QVariant> ret;
             switch (type)
@@ -217 +225 @@
                     HRESULT hr = mon->GetDisplayName(0,0, &str);
                     if (SUCCEEDED(hr)) {
-                        QString name = QString::fromUtf16((unsigned short*)str); 
+                        QString name = QString::fromWCharArray(str);
                                                 ComPointer<IMalloc> alloc;
                                                 ::CoGetMalloc(1, alloc.pparam());
@@ -232 +240 @@
                     HRESULT hr = ::DMOGetName(m_audioEffects[index], name);
                     if (SUCCEEDED(hr)) {
-                        ret["name"] = QString::fromUtf16((unsigned short*)name);
+                        ret["name"] = QString::fromWCharArray(name);
                     }
                 }