diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-02-25 04:03:39 (GMT) |
|---|---|---|
| committer | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-02-25 04:03:39 (GMT) |
| commit | f4d15309c2c44bb2fdc18a8c89629c6f415f0b67 (patch) | |
| tree | 08f9dc3fca34afb4f8f28111ebf147d2253634a1 /src/plugins/mediaservices | |
| parent | 77b5ffdbd0ad933ef5e4a50ee1660ea1b8f7c8cf (diff) | |
| download | Qt-f4d15309c2c44bb2fdc18a8c89629c6f415f0b67.zip Qt-f4d15309c2c44bb2fdc18a8c89629c6f415f0b67.tar.gz Qt-f4d15309c2c44bb2fdc18a8c89629c6f415f0b67.tar.bz2 | |
Fixed QTMoview object leak.
Reviewed-by: Justin McPherson
Diffstat (limited to 'src/plugins/mediaservices')
| -rw-r--r-- | src/plugins/mediaservices/qt7/mediaplayer/qt7playerservice.mm | 3 | ||||
| -rw-r--r-- | src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm | 3 |
2 files changed, 4 insertions, 2 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 diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm index 2dd3fe8..d83c0e3 100644 --- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm @@ -179,7 +179,8 @@ QT7PlayerSession::QT7PlayerSession(QObject *parent) QT7PlayerSession::~QT7PlayerSession() { [(QTMovieObserver*)m_movieObserver setMovie:nil]; - [(QTMovieObserver*)m_movieObserver release]; + [(QTMovieObserver*)m_movieObserver release]; + [(QTMovie*)m_QTMovie release]; } void *QT7PlayerSession::movie() const |