diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-25 05:45:21 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-25 05:45:21 (GMT) |
| commit | f3abaf5ee7cdef1c963df383885668abd55427c3 (patch) | |
| tree | 57e68d2bc2445f56534fa04dc4ad411db8da5b3e /src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm | |
| parent | 77f722aca2c5243f07733dcb302035fb3c454f3a (diff) | |
| parent | f4d15309c2c44bb2fdc18a8c89629c6f415f0b67 (diff) | |
| download | Qt-f3abaf5ee7cdef1c963df383885668abd55427c3.zip Qt-f3abaf5ee7cdef1c963df383885668abd55427c3.tar.gz Qt-f3abaf5ee7cdef1c963df383885668abd55427c3.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging
Diffstat (limited to 'src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm')
| -rw-r--r-- | src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm index faf75d1..205e862 100644 --- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE QT7PlayerService::QT7PlayerService(QObject *parent): QMediaService(parent) { - m_session = new QT7PlayerSession; + m_session = new QT7PlayerSession(this); m_control = new QT7PlayerControl(this); m_control->setSession(m_session); @@ -102,6 +102,7 @@ QT7PlayerService::QT7PlayerService(QObject *parent): QT7PlayerService::~QT7PlayerService() { + m_session->setVideoOutput(0); } QMediaControl *QT7PlayerService::control(const char *name) const |