diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-25 04:35:03 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-25 04:35:03 (GMT) |
commit | 062e4383c3b8c7c93e62ad564c47826369aa8a33 (patch) | |
tree | 69a4669eafc57624eb161615738a5b1316aec76a /src/3rdparty | |
parent | cb34d11e4c98e768432e00c867b3321d3b89dd9d (diff) | |
parent | 59f7146621f23def653629d00a5d4f42c9ddb0da (diff) | |
download | Qt-062e4383c3b8c7c93e62ad564c47826369aa8a33.zip Qt-062e4383c3b8c7c93e62ad564c47826369aa8a33.tar.gz Qt-062e4383c3b8c7c93e62ad564c47826369aa8a33.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix a missing error-signal when a server is shut down while downloading
Ensure that if this is does not have a valid filter when on XP or less
HTTP backend: fix build without Qt3 support
QNetworkAccessManager: enable synchronous HTTP calls
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/phonon/ds9/videorenderer_evr.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/3rdparty/phonon/ds9/videorenderer_evr.cpp b/src/3rdparty/phonon/ds9/videorenderer_evr.cpp index de3f46f..ff39eccc4 100644 --- a/src/3rdparty/phonon/ds9/videorenderer_evr.cpp +++ b/src/3rdparty/phonon/ds9/videorenderer_evr.cpp @@ -62,19 +62,21 @@ namespace Phonon VideoRendererEVR::VideoRendererEVR(QWidget *target) : m_target(target) { + if (QSysInfo::WindowsVersion < QSysInfo::WV_VISTA) + return; m_filter = Filter(CLSID_EnhancedVideoRenderer, IID_IBaseFilter); if (!m_filter) { return; } ComPointer<IMFVideoDisplayControl> filterControl = getService<IMFVideoDisplayControl>(m_filter, MR_VIDEO_RENDER_SERVICE, IID_IMFVideoDisplayControl); - if (!filterControl) { + if (!filterControl || + FAILED(filterControl->SetVideoWindow(reinterpret_cast<HWND>(target->winId()))) || + FAILED(filterControl->SetAspectRatioMode(MFVideoARMode_None)) || // We're in control of the size + !getService<IMFVideoMixerControl>(m_filter, MR_VIDEO_MIXER_SERVICE, IID_IMFVideoMixerControl) || + !getService<IMFVideoProcessor>(m_filter, MR_VIDEO_MIXER_SERVICE, IID_IMFVideoProcessor)) { m_filter = Filter(); //will release the interface - return; } - - filterControl->SetVideoWindow(reinterpret_cast<HWND>(target->winId())); - filterControl->SetAspectRatioMode(MFVideoARMode_None); // We're in control of the size } QImage VideoRendererEVR::snapshot() const |