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

Changed metadata keys type from enum to QString.

Browse Source 
This allows to combine metaData and extendedMetaData
and simplify metadata handling on both backend and application sides.

Change-Id: I136eedc86c215be3485db101c43069ca7c82101b
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-01-16 16:40:47 +10:00
committed by Qt by Nokia
parent 382ba7d4f4
commit 8ff5b88b27
54 changed files with 736 additions and 1050 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,18 +58,15 @@ public:
bool isMetaDataAvailable() const;
bool isWritable() const;
QVariant metaData(QtMultimedia::MetaData key) const;
QList<QtMultimedia::MetaData> availableMetaData() const;
QVariant extendedMetaData(const QString &key) const ;
QStringList availableExtendedMetaData() const;
QVariant metaData(const QString &key) const;
QStringList availableMetaData() const;
private Q_SLOTS:
void updateTags();
private:
QT7PlayerSession *m_session;
QMap<QtMultimedia::MetaData, QVariant> m_tags;
QMap<QString, QVariant> m_tags;
};
QT_END_NAMESPACE

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

@@ -72,27 +72,16 @@ bool QT7PlayerMetaDataControl::isWritable() const
return false;
}
QVariant QT7PlayerMetaDataControl::metaData(QtMultimedia::MetaData key) const
QVariant QT7PlayerMetaDataControl::metaData(const QString &key) const
{
return m_tags.value(key);
}
QList<QtMultimedia::MetaData> QT7PlayerMetaDataControl::availableMetaData() const
QStringList QT7PlayerMetaDataControl::availableMetaData() const
{
return m_tags.keys();
}
QVariant QT7PlayerMetaDataControl::extendedMetaData(const QString &key) const
{
Q_UNUSED(key);
return QVariant();
}
QStringList QT7PlayerMetaDataControl::availableExtendedMetaData() const
{
return QStringList();
}
#ifdef QUICKTIME_C_API_AVAILABLE
static QString stripCopyRightSymbol(const QString &key)
@@ -244,13 +233,13 @@ void QT7PlayerMetaDataControl::updateTags()
metaMap.insert(QLatin1String("nam"), QString::fromUtf8([name UTF8String]));
#endif // QUICKTIME_C_API_AVAILABLE
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")));
m_tags.insert(QtMultimedia::MetaData::AlbumArtist, metaMap.value(QLatin1String("ART")));
m_tags.insert(QtMultimedia::MetaData::AlbumTitle, metaMap.value(QLatin1String("alb")));
m_tags.insert(QtMultimedia::MetaData::Title, metaMap.value(QLatin1String("nam")));
m_tags.insert(QtMultimedia::MetaData::Date, metaMap.value(QLatin1String("day")));
m_tags.insert(QtMultimedia::MetaData::Genre, metaMap.value(QLatin1String("gnre")));
m_tags.insert(QtMultimedia::MetaData::TrackNumber, metaMap.value(QLatin1String("trk")));
m_tags.insert(QtMultimedia::MetaData::Description, metaMap.value(QLatin1String("des")));
}
if (!wasEmpty || !m_tags.isEmpty())