diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-08 07:01:15 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-08 07:01:15 (GMT) |
| commit | 23ae8b6badfd688f962590268a6147771d27266c (patch) | |
| tree | fc27f20c32e6dccbe39267214e65528b238ced70 /src/3rdparty | |
| parent | 768cab51239a45f00d5ee3857efecd3d2cdcb99b (diff) | |
| parent | d4257360234a967bfbacde92ec2bb1ac8979b793 (diff) | |
| download | Qt-23ae8b6badfd688f962590268a6147771d27266c.zip Qt-23ae8b6badfd688f962590268a6147771d27266c.tar.gz Qt-23ae8b6badfd688f962590268a6147771d27266c.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp | 1 | ||||
| -rw-r--r-- | src/3rdparty/phonon/ds9/videowidget.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp b/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp index 298e9fa..81ebb8b 100644 --- a/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp +++ b/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp @@ -169,6 +169,7 @@ namespace Phonon Q_ASSERT(SUCCEEDED(hr)); ComPointer<IVMRWindowlessControl9> windowlessControl(m_filter, IID_IVMRWindowlessControl9); windowlessControl->SetVideoClippingWindow(reinterpret_cast<HWND>(target->winId())); + windowlessControl->SetAspectRatioMode(VMR9ARMode_None); //we're in control of the size } QImage VideoRendererVMR9::snapshot() const diff --git a/src/3rdparty/phonon/ds9/videowidget.cpp b/src/3rdparty/phonon/ds9/videowidget.cpp index de7ce5f..0ef653f 100644 --- a/src/3rdparty/phonon/ds9/videowidget.cpp +++ b/src/3rdparty/phonon/ds9/videowidget.cpp @@ -261,6 +261,7 @@ namespace Phonon { m_aspectRatio = aspectRatio; updateVideoSize(); + m_widget->update(); } Phonon::VideoWidget::ScaleMode VideoWidget::scaleMode() const @@ -279,6 +280,7 @@ namespace Phonon { m_scaleMode = scaleMode; updateVideoSize(); + m_widget->update(); } void VideoWidget::setBrightness(qreal b) |