summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon/mmf/videowidget.h
diff options
context:
space:
mode:
authorGareth Stockwell <gareth.stockwell@sosco.com>2009-08-25 17:10:58 (GMT)
committerGareth Stockwell <gareth.stockwell@sosco.com>2009-08-25 17:10:58 (GMT)
commit55dcdac49aeaf9a7af9d420140e7629682fa4573 (patch)
tree71ac31355439a48825654055a112faebbee21c5f /src/3rdparty/phonon/mmf/videowidget.h
parentf3defb60f21cfe2456ace1148afcce43112f9c51 (diff)
downloadQt-55dcdac49aeaf9a7af9d420140e7629682fa4573.zip
Qt-55dcdac49aeaf9a7af9d420140e7629682fa4573.tar.gz
Qt-55dcdac49aeaf9a7af9d420140e7629682fa4573.tar.bz2
Made video playback visible using a couple of hacks
These hacks, which are enabled using macros in defs.h, are: PHONON_MMF_HARD_CODE_VIDEO_RECT VideoPlayer should obtain the screen rectangle into which video rendering will occur, using the CoeControl associated with the video widget (i.e. the VideoOutput object). However, this control always has co-ordinates (relative to its parent) of (0,0)-(100,30), regardless of whether updateGeometry() and show() are called on the widget. So, this macro just hard-codes the screen rectangle to a value which works when the breakfast.mp4 clip is used for testing. PHONON_MMF_EXPLICITLY_SHOW_VIDEO_WIDGET In order that the video region does not overwrite the slider and buttons below it, the parent widget of the VideoObject instance must be appropriately re-sized. Debugging showed that both the parent and grandparent of VideoObject are in fact invisible at the time playback begins, so for now we just manually call show() on the grandparent. Clearly both of these are only temporary measures, for use until the underlying cause of the problem has been determined.
Diffstat (limited to 'src/3rdparty/phonon/mmf/videowidget.h')
-rw-r--r--src/3rdparty/phonon/mmf/videowidget.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/mmf/videowidget.h b/src/3rdparty/phonon/mmf/videowidget.h
index 5c27c7f..e8fc603 100644
--- a/src/3rdparty/phonon/mmf/videowidget.h
+++ b/src/3rdparty/phonon/mmf/videowidget.h
@@ -57,8 +57,8 @@ namespace Phonon
VideoOutput& videoOutput();
private:
- QScopedPointer<VideoOutput> m_videoOutput;
-
+ QScopedPointer<QWidget> m_widget;
+
Phonon::VideoWidget::AspectRatio m_aspectRatio;
qreal m_brightness;
Phonon::VideoWidget::ScaleMode m_scaleMode;