summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon/ds9/qpin.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/phonon/ds9/qpin.h')
-rw-r--r--src/3rdparty/phonon/ds9/qpin.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/3rdparty/phonon/ds9/qpin.h b/src/3rdparty/phonon/ds9/qpin.h
index 280ad61..a3287c4 100644
--- a/src/3rdparty/phonon/ds9/qpin.h
+++ b/src/3rdparty/phonon/ds9/qpin.h
@@ -22,7 +22,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>.
#include <QtCore/QString>
#include <QtCore/QVector>
-#include <QtCore/QMutex>
+#include <QtCore/QReadWriteLock>
#include <dshow.h>
@@ -85,8 +85,8 @@ namespace Phonon
protected:
//this can be used by sub-classes
- mutable QMutex m_mutex;
- QBaseFilter * const m_parent;
+ mutable QReadWriteLock m_lock;
+ QBaseFilter *m_parent;
bool m_flushing;
private:
@@ -98,6 +98,7 @@ namespace Phonon
const PIN_DIRECTION m_direction;
QVector<AM_MEDIA_TYPE> m_mediaTypes; //accepted media types
AM_MEDIA_TYPE m_connectedType;
+ QString m_name;
IMemAllocator *m_memAlloc;
};