diff options
| author | Ling Hu <ling.hu@nokia.com> | 2012-06-20 12:01:24 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-20 06:41:49 +0200 |
| commit | bd071a3853ec5fe2032e40835e4754c21460a72d (patch) | |
| tree | f9f1ec641c9f8dbb8f9bd3b6ca08ffd0c9ca05f2 /src/plugins/wmf/player/mfmetadatacontrol.cpp | |
| parent | 6d2883e7ed0a5f9ec09bca1468cce6f4f8c22aea (diff) | |
Enabled wmf plugin on Windows again
Change-Id: Ia1fe3ef6ec8f70888c7beb390678935ad9995a90
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/plugins/wmf/player/mfmetadatacontrol.cpp')
| -rw-r--r-- | src/plugins/wmf/player/mfmetadatacontrol.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/wmf/player/mfmetadatacontrol.cpp b/src/plugins/wmf/player/mfmetadatacontrol.cpp index 6671a5cc0..a21787eba 100644 --- a/src/plugins/wmf/player/mfmetadatacontrol.cpp +++ b/src/plugins/wmf/player/mfmetadatacontrol.cpp @@ -81,7 +81,7 @@ QVariant MFMetaDataControl::metaData(const QString &key) const if (m_content) hr = m_content->GetValue(m_commonKeys[index], &var); else if (m_metaData) - hr = m_metaData->GetProperty(m_commonNames[index].utf16(), &var); + hr = m_metaData->GetProperty(reinterpret_cast<LPCWSTR>(m_commonNames[index].utf16()), &var); if (SUCCEEDED(hr)) value = convertValue(var); @@ -98,7 +98,7 @@ QVariant MFMetaDataControl::convertValue(const PROPVARIANT& var) const //add more later if necessary switch (var.vt) { case VT_LPWSTR: - value = QString::fromUtf16(var.pwszVal); + value = QString::fromUtf16(reinterpret_cast<const ushort*>(var.pwszVal)); break; case VT_UI4: value = uint(var.ulVal); @@ -133,8 +133,6 @@ void MFMetaDataControl::updateSource(IMFPresentationDescriptor* sourcePD, IMFMed m_availableMetaDatas.clear(); m_commonKeys.clear(); m_commonNames.clear(); - m_extendedMetaDatas.clear(); - m_extendedKeys.clear(); if (SUCCEEDED(MFGetService(mediaSource, MF_PROPERTY_HANDLER_SERVICE, IID_PPV_ARGS(&m_content)))) { DWORD cProps; @@ -196,9 +194,9 @@ void MFMetaDataControl::updateSource(IMFPresentationDescriptor* sourcePD, IMFMed m_availableMetaDatas.push_back(QtMultimedia::MetaData::Copyright); //TODO: add more common keys } else { - m_availableMetaDatas.push_back(QString::fromUtf16(sName)); + m_availableMetaDatas.push_back(QString::fromUtf16(reinterpret_cast<const ushort*>(sName))); } - m_commonNames.push_back(QString::fromUtf16(sName)); + m_commonNames.push_back(QString::fromUtf16(reinterpret_cast<const ushort*>(sName))); } } PropVariantClear(&varNames); |