summaryrefslogtreecommitdiffstats
path: root/src/plugins/mediaservices/qt7
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2010-02-19 06:16:44 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2010-02-19 06:16:44 (GMT)
commitf80b82ed61bece1843c6ae011fb5678ba8210949 (patch)
tree9c7cf3c697d2b046832d7422e2afe95e25d3a052 /src/plugins/mediaservices/qt7
parent50fe29b569849d05db1625fa30fbd8618a941c5a (diff)
downloadQt-f80b82ed61bece1843c6ae011fb5678ba8210949.zip
Qt-f80b82ed61bece1843c6ae011fb5678ba8210949.tar.gz
Qt-f80b82ed61bece1843c6ae011fb5678ba8210949.tar.bz2
Change namespace; QtMedia -> QtMultimedia
Diffstat (limited to 'src/plugins/mediaservices/qt7')
-rw-r--r--src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h8
-rw-r--r--src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm20
2 files changed, 14 insertions, 14 deletions
diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h
index 9aa9887..f16807a 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h
+++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h
@@ -61,9 +61,9 @@ public:
bool isMetaDataAvailable() const;
bool isWritable() const;
- QVariant metaData(QtMedia::MetaData key) const;
- void setMetaData(QtMedia::MetaData key, const QVariant &value);
- QList<QtMedia::MetaData> availableMetaData() const;
+ QVariant metaData(QtMultimedia::MetaData key) const;
+ void setMetaData(QtMultimedia::MetaData key, const QVariant &value);
+ QList<QtMultimedia::MetaData> availableMetaData() const;
QVariant extendedMetaData(const QString &key) const ;
void setExtendedMetaData(const QString &key, const QVariant &value);
@@ -74,7 +74,7 @@ private slots:
private:
QT7PlayerSession *m_session;
- QMap<QtMedia::MetaData, QVariant> m_tags;
+ QMap<QtMultimedia::MetaData, QVariant> m_tags;
};
QT_END_NAMESPACE
diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm
index 96b7a68..a14981a 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm
+++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm
@@ -72,18 +72,18 @@ bool QT7PlayerMetaDataControl::isWritable() const
return false;
}
-QVariant QT7PlayerMetaDataControl::metaData(QtMedia::MetaData key) const
+QVariant QT7PlayerMetaDataControl::metaData(QtMultimedia::MetaData key) const
{
return m_tags.value(key);
}
-void QT7PlayerMetaDataControl::setMetaData(QtMedia::MetaData key, QVariant const &value)
+void QT7PlayerMetaDataControl::setMetaData(QtMultimedia::MetaData key, QVariant const &value)
{
Q_UNUSED(key);
Q_UNUSED(value);
}
-QList<QtMedia::MetaData> QT7PlayerMetaDataControl::availableMetaData() const
+QList<QtMultimedia::MetaData> QT7PlayerMetaDataControl::availableMetaData() const
{
return m_tags.keys();
}
@@ -243,13 +243,13 @@ void QT7PlayerMetaDataControl::updateTags()
metaMap.insert(QLatin1String("nam"), QString::fromUtf8([name UTF8String]));
#endif // QUICKTIME_C_API_AVAILABLE
- m_tags.insert(QtMedia::AlbumArtist, metaMap.value(QLatin1String("ART")));
- m_tags.insert(QtMedia::AlbumTitle, metaMap.value(QLatin1String("alb")));
- m_tags.insert(QtMedia::Title, metaMap.value(QLatin1String("nam")));
- m_tags.insert(QtMedia::Date, metaMap.value(QLatin1String("day")));
- m_tags.insert(QtMedia::Genre, metaMap.value(QLatin1String("gnre")));
- m_tags.insert(QtMedia::TrackNumber, metaMap.value(QLatin1String("trk")));
- m_tags.insert(QtMedia::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())