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

Rename QtMultimediaKit to QtMultimedia.

Browse Source 
There are a few legacy bits left in place so it passes CI, and
then qt5.git etc can be updated.

Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a
Reviewed-on: http://codereview.qt-project.org/5368
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2011-10-06 14:31:58 +10:00
committed by Qt by Nokia
parent 55bc4f2b46
commit 03f22bcdaf
395 changed files with 1393 additions and 3088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/wmf/player/mfmetadatacontrol.cpp
View File

@@ -65,7 +65,7 @@ bool MFMetaDataControl::isMetaDataAvailable() const
return m_content || m_metaData;
}
QVariant MFMetaDataControl::metaData(QtMultimediaKit::MetaData key) const
QVariant MFMetaDataControl::metaData(QtMultimedia::MetaData key) const
{
QVariant value;
if (!isMetaDataAvailable())
@@ -113,7 +113,7 @@ QVariant MFMetaDataControl::convertValue(const PROPVARIANT& var) const
return value;
}
QList<QtMultimediaKit::MetaData> MFMetaDataControl::availableMetaData() const
QList<QtMultimedia::MetaData> MFMetaDataControl::availableMetaData() const
{
return m_availableMetaDatas;
}
@@ -173,15 +173,15 @@ void MFMetaDataControl::updateSource(IMFPresentationDescriptor* sourcePD, IMFMed
continue;
bool common = true;
if (key == PKEY_Author) {
m_availableMetaDatas.push_back(QtMultimediaKit::Author);
m_availableMetaDatas.push_back(QtMultimedia::Author);
} else if (key == PKEY_Title) {
m_availableMetaDatas.push_back(QtMultimediaKit::Title);
m_availableMetaDatas.push_back(QtMultimedia::Title);
} else if (key == PKEY_ParentalRating) {
m_availableMetaDatas.push_back(QtMultimediaKit::ParentalRating);
m_availableMetaDatas.push_back(QtMultimedia::ParentalRating);
} else if (key == PKEY_Comment) {
m_availableMetaDatas.push_back(QtMultimediaKit::Description);
m_availableMetaDatas.push_back(QtMultimedia::Description);
} else if (key == PKEY_Copyright) {
m_availableMetaDatas.push_back(QtMultimediaKit::Copyright);
m_availableMetaDatas.push_back(QtMultimedia::Copyright);
//TODO: add more common keys
} else {
common = false;
@@ -213,15 +213,15 @@ void MFMetaDataControl::updateSource(IMFPresentationDescriptor* sourcePD, IMFMed
#endif
bool common = true;
if (wcscmp(sName, L"Author") == 0) {
m_availableMetaDatas.push_back(QtMultimediaKit::Author);
m_availableMetaDatas.push_back(QtMultimedia::Author);
} else if (wcscmp(sName, L"Title") == 0) {
m_availableMetaDatas.push_back(QtMultimediaKit::Title);
m_availableMetaDatas.push_back(QtMultimedia::Title);
} else if (wcscmp(sName, L"Rating") == 0) {
m_availableMetaDatas.push_back(QtMultimediaKit::ParentalRating);
m_availableMetaDatas.push_back(QtMultimedia::ParentalRating);
} else if (wcscmp(sName, L"Description") == 0) {
m_availableMetaDatas.push_back(QtMultimediaKit::Description);
m_availableMetaDatas.push_back(QtMultimedia::Description);
} else if (wcscmp(sName, L"Copyright") == 0) {
m_availableMetaDatas.push_back(QtMultimediaKit::Copyright);
m_availableMetaDatas.push_back(QtMultimedia::Copyright);
//TODO: add more common keys
} else {
common = false;

6
src/plugins/wmf/player/mfmetadatacontrol.h
View File

@@ -56,8 +56,8 @@ public:
bool isMetaDataAvailable() const;
QVariant metaData(QtMultimediaKit::MetaData key) const;
QList<QtMultimediaKit::MetaData> availableMetaData() const;
QVariant metaData(QtMultimedia::MetaData key) const;
QList<QtMultimedia::MetaData> availableMetaData() const;
QVariant extendedMetaData(const QString &key) const;
QStringList availableExtendedMetaData() const;
@@ -69,7 +69,7 @@ private:
IPropertyStore *m_content; //for Windows7
IMFMetadata *m_metaData; //for Vista
QList<QtMultimediaKit::MetaData> m_availableMetaDatas;
QList<QtMultimedia::MetaData> m_availableMetaDatas;
QList<PROPERTYKEY> m_commonKeys; //for Windows7
QStringList m_commonNames; //for Vista

4
src/plugins/wmf/wmf.pro
View File

@@ -1,12 +1,12 @@
load(qt_module)
TARGET = wmfengine
QT += multimediakit-private network multimediakitwidgets-private
QT += multimedia-private network multimediawidgets-private
PLUGIN_TYPE=mediaservice
load(qt_plugin)
DESTDIR = $$QT.multimediakit.plugins/$${PLUGIN_TYPE}
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
DEPENDPATH += .