diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-31 06:45:31 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-31 06:45:31 (GMT) |
| commit | b6a0595e6479138b9d58c499f4285b357e81b2eb (patch) | |
| tree | 2e10e8a59ae55f75e44b67a310103a084e8d169f /src/3rdparty/phonon/ds9/qpin.h | |
| parent | e178cf86ff5007d5af31181d064b1bf824ffbc33 (diff) | |
| parent | a795a55cf2796a44cf30e002962ebad0588ef740 (diff) | |
| download | Qt-b6a0595e6479138b9d58c499f4285b357e81b2eb.zip Qt-b6a0595e6479138b9d58c499f4285b357e81b2eb.tar.gz Qt-b6a0595e6479138b9d58c499f4285b357e81b2eb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/3rdparty/phonon/ds9/qpin.h')
| -rw-r--r-- | src/3rdparty/phonon/ds9/qpin.h | 7 |
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; }; |