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

6
src/plugins/qt7/mediaplayer/qt7playermetadata.h
View File

@@ -58,8 +58,8 @@ public:
bool isMetaDataAvailable() const;
bool isWritable() 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 slots:
private:
QT7PlayerSession *m_session;
QMap<QtMultimediaKit::MetaData, QVariant> m_tags;
QMap<QtMultimedia::MetaData, QVariant> m_tags;
};
QT_END_NAMESPACE

18
src/plugins/qt7/mediaplayer/qt7playermetadata.mm
View File

@@ -72,12 +72,12 @@ bool QT7PlayerMetaDataControl::isWritable() const
return false;
}
QVariant QT7PlayerMetaDataControl::metaData(QtMultimediaKit::MetaData key) const
QVariant QT7PlayerMetaDataControl::metaData(QtMultimedia::MetaData key) const
{
return m_tags.value(key);
}
QList<QtMultimediaKit::MetaData> QT7PlayerMetaDataControl::availableMetaData() const
QList<QtMultimedia::MetaData> QT7PlayerMetaDataControl::availableMetaData() const
{
return m_tags.keys();
}
@@ -244,13 +244,13 @@ void QT7PlayerMetaDataControl::updateTags()
metaMap.insert(QLatin1String("nam"), QString::fromUtf8([name UTF8String]));
#endif // QUICKTIME_C_API_AVAILABLE
m_tags.insert(QtMultimediaKit::AlbumArtist, metaMap.value(QLatin1String("ART")));
m_tags.insert(QtMultimediaKit::AlbumTitle, metaMap.value(QLatin1String("alb")));
m_tags.insert(QtMultimediaKit::Title, metaMap.value(QLatin1String("nam")));
m_tags.insert(QtMultimediaKit::Date, metaMap.value(QLatin1String("day")));
m_tags.insert(QtMultimediaKit::Genre, metaMap.value(QLatin1String("gnre")));
m_tags.insert(QtMultimediaKit::TrackNumber, metaMap.value(QLatin1String("trk")));
m_tags.insert(QtMultimediaKit::Description, metaMap.value(QLatin1String("des")));
m_tags.insert(QtMultimedia::AlbumArtist, metaMap.value(QLatin1String("ART")));
m_tags.insert(QtMultimedia::AlbumTitle, metaMap.value(QLatin1String("alb")));
m_tags.insert(QtMultimedia::Title, metaMap.value(QLatin1String("nam")));
m_tags.insert(QtMultimedia::Date, metaMap.value(QLatin1String("day")));
m_tags.insert(QtMultimedia::Genre, metaMap.value(QLatin1String("gnre")));
m_tags.insert(QtMultimedia::TrackNumber, metaMap.value(QLatin1String("trk")));
m_tags.insert(QtMultimedia::Description, metaMap.value(QLatin1String("des")));
}
if (!wasEmpty || !m_tags.isEmpty())