diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-01-06 14:52:31 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-01-06 14:52:31 (GMT) |
| commit | 216adf3dbe76f3c09340aafee875da28d3f36605 (patch) | |
| tree | 87baec4b6c73ca569f4bbd74f86010cfa236c75a /src/3rdparty/phonon/mmf/videowidget.cpp | |
| parent | 66275bc468339ec2599ba660b728304858e30b39 (diff) | |
| parent | 3f648dc075689e2ffedda2769cc76b4a56fb1073 (diff) | |
| download | Qt-216adf3dbe76f3c09340aafee875da28d3f36605.zip Qt-216adf3dbe76f3c09340aafee875da28d3f36605.tar.gz Qt-216adf3dbe76f3c09340aafee875da28d3f36605.tar.bz2 | |
Merge branch 'mmfphonon' into 4.6
Diffstat (limited to 'src/3rdparty/phonon/mmf/videowidget.cpp')
| -rw-r--r-- | src/3rdparty/phonon/mmf/videowidget.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/3rdparty/phonon/mmf/videowidget.cpp b/src/3rdparty/phonon/mmf/videowidget.cpp index bd22307..bc9acfd 100644 --- a/src/3rdparty/phonon/mmf/videowidget.cpp +++ b/src/3rdparty/phonon/mmf/videowidget.cpp @@ -157,10 +157,18 @@ QWidget* MMF::VideoWidget::widget() return m_videoOutput.data(); } -bool MMF::VideoWidget::activateOnMediaObject(MediaObject *mo) +//----------------------------------------------------------------------------- +// MediaNode +//----------------------------------------------------------------------------- + +void MMF::VideoWidget::connectMediaObject(MediaObject *mediaObject) +{ + mediaObject->setVideoOutput(m_videoOutput.data()); +} + +void MMF::VideoWidget::disconnectMediaObject(MediaObject *mediaObject) { - mo->setVideoOutput(m_videoOutput.data()); - return true; + mediaObject->setVideoOutput(0); } QT_END_NAMESPACE |