diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-01-13 04:02:40 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-01-13 04:02:40 (GMT) |
| commit | 08c3b4b7c3c384829f7f86ec2d8e7f3499942284 (patch) | |
| tree | 8b1e09e7ad734e60dce70959f245c99408550a96 /src/3rdparty/phonon/mmf/videowidget.cpp | |
| parent | 5acc7d86245c17c690b09a742acfe80e6076f599 (diff) | |
| parent | 6900cf8d7cb8d1e98f3af2ac7ce909dc3b5fc2ef (diff) | |
| download | Qt-08c3b4b7c3c384829f7f86ec2d8e7f3499942284.zip Qt-08c3b4b7c3c384829f7f86ec2d8e7f3499942284.tar.gz Qt-08c3b4b7c3c384829f7f86ec2d8e7f3499942284.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team 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 |