diff options
author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2012-03-16 11:41:42 -0500 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-20 01:07:51 +0100 |
commit | 61c09d1614c560de9514ac0fd3344bf0280fca33 (patch) | |
tree | 5e426e9187039bbf7a73be488651af8131f84f12 /src | |
parent | 3f73ddbc711e3e3fa319b4eba10e738df59f07b0 (diff) | |
download | qtmultimedia-61c09d1614c560de9514ac0fd3344bf0280fca33.tar.gz |
Compile on Windows
Conversion of WId to HWND requires reinterpret_cast.
Comment out RatingOrganisation for directshow as it is commented out in
the gstreamer plugins too.
(Note that both directshow and gstreamer plugins spell it incorrectly.
It's spelled "RatingOrganization" in qtmedianamespace.h)
Change-Id: I4cbcecfeb62ad795facf498d1c3d84a776d2ca35
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/directshow/player/directshowmetadatacontrol.cpp | 2 | ||||
-rw-r--r-- | src/plugins/directshow/player/vmr9videowindowcontrol.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp index 6e12384ad..01f5ec55a 100644 --- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp +++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp @@ -76,7 +76,7 @@ static const QWMMetaDataKeyLookup qt_wmMetaDataKeys[] = { QtMultimedia::MetaData::Publisher, L"WM/Publisher" }, { QtMultimedia::MetaData::Copyright, L"Copyright" }, { QtMultimedia::MetaData::ParentalRating, L"ParentalRating" }, - { QtMultimedia::MetaData::RatingOrganisation, L"RatingOrganisation" }, + //{ QtMultimedia::MetaData::RatingOrganisation, L"RatingOrganisation" }, // Media { QtMultimedia::MetaData::Size, L"FileSize" }, diff --git a/src/plugins/directshow/player/vmr9videowindowcontrol.cpp b/src/plugins/directshow/player/vmr9videowindowcontrol.cpp index 98cc98641..a5b22ad87 100644 --- a/src/plugins/directshow/player/vmr9videowindowcontrol.cpp +++ b/src/plugins/directshow/player/vmr9videowindowcontrol.cpp @@ -87,7 +87,7 @@ void Vmr9VideoWindowControl::setWinId(WId id) if (IVMRWindowlessControl9 *control = com_cast<IVMRWindowlessControl9>( m_filter, IID_IVMRWindowlessControl9)) { - control->SetVideoClippingWindow(m_windowId); + control->SetVideoClippingWindow(reinterpret_cast<HWND>(m_windowId)); control->SetBorderColor(m_windowColor); control->Release(); } @@ -138,12 +138,12 @@ void Vmr9VideoWindowControl::repaint() { PAINTSTRUCT paint; - if (HDC dc = ::BeginPaint(m_windowId, &paint)) { + if (HDC dc = ::BeginPaint(reinterpret_cast<HWND>(m_windowId), &paint)) { HRESULT hr = E_FAIL; if (IVMRWindowlessControl9 *control = com_cast<IVMRWindowlessControl9>( m_filter, IID_IVMRWindowlessControl9)) { - hr = control->RepaintVideo(m_windowId, dc); + hr = control->RepaintVideo(reinterpret_cast<HWND>(m_windowId), dc); control->Release(); } @@ -163,7 +163,7 @@ void Vmr9VideoWindowControl::repaint() ::DeleteObject(pen); ::DeleteObject(brush); } - ::EndPaint(m_windowId, &paint); + ::EndPaint(reinterpret_cast<HWND>(m_windowId), &paint); } } |