slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compile on Windows

Browse Source 
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>
This commit is contained in:
Marius Storm-Olsen
2012-03-16 11:41:42 -05:00
committed by Qt by Nokia
parent 3f73ddbc71
commit 61c09d1614
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/directshow/player/directshowmetadatacontrol.cpp
View File

@@ -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" },

8
src/plugins/directshow/player/vmr9videowindowcontrol.cpp
View File

@@ -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);
}
}