qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp Wed Jun 23 19:08:38 2010 +0300
@@ -44,7 +44,7 @@
#include <QtCore/qdebug.h>
S60MediaMetaDataProvider::S60MediaMetaDataProvider(MS60MediaPlayerResolver& mediaPlayerResolver, QObject *parent)
- : QMetaDataControl(parent)
+ : QMetaDataReaderControl(parent)
, m_mediaPlayerResolver(mediaPlayerResolver)
, m_session(NULL)
{
@@ -67,7 +67,7 @@
return false;
}
-QVariant S60MediaMetaDataProvider::metaData(QtMediaServices::MetaData key) const
+QVariant S60MediaMetaDataProvider::metaData(QtMultimedia::MetaData key) const
{
m_session = m_mediaPlayerResolver.PlayerSession();
if (m_session && m_session->isMetadataAvailable())
@@ -75,21 +75,16 @@
return QVariant();
}
-void S60MediaMetaDataProvider::setMetaData(QtMediaServices::MetaData key, QVariant const &value)
-{
- Q_UNUSED(key);
- Q_UNUSED(value);
-}
-QList<QtMediaServices::MetaData> S60MediaMetaDataProvider::availableMetaData() const
+QList<QtMultimedia::MetaData> S60MediaMetaDataProvider::availableMetaData() const
{
m_session = m_mediaPlayerResolver.PlayerSession();
- QList<QtMediaServices::MetaData> metaDataTags;
+ QList<QtMultimedia::MetaData> metaDataTags;
if (m_session && m_session->isMetadataAvailable()) {
- for (int i = QtMediaServices::Title; i <= QtMediaServices::DeviceSettingDescription; i++) {
- QString metaData = metaDataKeyAsString((QtMediaServices::MetaData)i);
+ for (int i = QtMultimedia::Title; i <= QtMultimedia::DeviceSettingDescription; i++) {
+ QString metaData = metaDataKeyAsString((QtMultimedia::MetaData)i);
if (!metaData.isEmpty()) {
if (!m_session->metaData(metaData).toString().isEmpty()) {
- metaDataTags.append((QtMediaServices::MetaData)i);
+ metaDataTags.append((QtMultimedia::MetaData)i);
}
}
}
@@ -105,12 +100,6 @@
return QVariant();
}
-void S60MediaMetaDataProvider::setExtendedMetaData(const QString &key, QVariant const &value)
-{
- Q_UNUSED(key);
- Q_UNUSED(value);
-}
-
QStringList S60MediaMetaDataProvider::availableExtendedMetaData() const
{
m_session = m_mediaPlayerResolver.PlayerSession();
@@ -119,59 +108,60 @@
return QStringList();
}
-QString S60MediaMetaDataProvider::metaDataKeyAsString(QtMediaServices::MetaData key) const
+QString S60MediaMetaDataProvider::metaDataKeyAsString(QtMultimedia::MetaData key) const
{
switch(key) {
- case QtMediaServices::Title: return "title";
- case QtMediaServices::AlbumArtist: return "artist";
- case QtMediaServices::Comment: return "comment";
- case QtMediaServices::Genre: return "genre";
- case QtMediaServices::Year: return "year";
- case QtMediaServices::Copyright: return "copyright";
- case QtMediaServices::AlbumTitle: return "album";
- case QtMediaServices::Composer: return "composer";
- case QtMediaServices::TrackNumber: return "albumtrack";
- case QtMediaServices::AudioBitRate: return "audiobitrate";
- case QtMediaServices::VideoBitRate: return "videobitrate";
- case QtMediaServices::Duration: return "duration";
- case QtMediaServices::MediaType: return "contenttype";
- case QtMediaServices::SubTitle: // TODO: Find the matching metadata keys
- case QtMediaServices::Description:
- case QtMediaServices::Category:
- case QtMediaServices::Date:
- case QtMediaServices::UserRating:
- case QtMediaServices::Keywords:
- case QtMediaServices::Language:
- case QtMediaServices::Publisher:
- case QtMediaServices::ParentalRating:
- case QtMediaServices::RatingOrganisation:
- case QtMediaServices::Size:
- case QtMediaServices::AudioCodec:
- case QtMediaServices::AverageLevel:
- case QtMediaServices::ChannelCount:
- case QtMediaServices::PeakValue:
- case QtMediaServices::SampleRate:
- case QtMediaServices::Author:
- case QtMediaServices::ContributingArtist:
- case QtMediaServices::Conductor:
- case QtMediaServices::Lyrics:
- case QtMediaServices::Mood:
- case QtMediaServices::TrackCount:
- case QtMediaServices::CoverArtUrlSmall:
- case QtMediaServices::CoverArtUrlLarge:
- case QtMediaServices::Resolution:
- case QtMediaServices::PixelAspectRatio:
- case QtMediaServices::VideoFrameRate:
- case QtMediaServices::VideoCodec:
- case QtMediaServices::PosterUrl:
- case QtMediaServices::ChapterNumber:
- case QtMediaServices::Director:
- case QtMediaServices::LeadPerformer:
- case QtMediaServices::Writer:
- case QtMediaServices::CameraManufacturer:
- case QtMediaServices::CameraModel:
- case QtMediaServices::Event:
- case QtMediaServices::Subject:
+ case QtMultimedia::Title: return "title";
+ case QtMultimedia::AlbumArtist: return "artist";
+ case QtMultimedia::Comment: return "comment";
+ case QtMultimedia::Genre: return "genre";
+ case QtMultimedia::Year: return "year";
+ case QtMultimedia::Copyright: return "copyright";
+ case QtMultimedia::AlbumTitle: return "album";
+ case QtMultimedia::Composer: return "composer";
+ case QtMultimedia::TrackNumber: return "albumtrack";
+ case QtMultimedia::AudioBitRate: return "audiobitrate";
+ case QtMultimedia::VideoBitRate: return "videobitrate";
+ case QtMultimedia::Duration: return "duration";
+ case QtMultimedia::MediaType: return "contenttype";
+ case QtMultimedia::CoverArtImage: return "attachedpicture";
+ case QtMultimedia::SubTitle: // TODO: Find the matching metadata keys
+ case QtMultimedia::Description:
+ case QtMultimedia::Category:
+ case QtMultimedia::Date:
+ case QtMultimedia::UserRating:
+ case QtMultimedia::Keywords:
+ case QtMultimedia::Language:
+ case QtMultimedia::Publisher:
+ case QtMultimedia::ParentalRating:
+ case QtMultimedia::RatingOrganisation:
+ case QtMultimedia::Size:
+ case QtMultimedia::AudioCodec:
+ case QtMultimedia::AverageLevel:
+ case QtMultimedia::ChannelCount:
+ case QtMultimedia::PeakValue:
+ case QtMultimedia::SampleRate:
+ case QtMultimedia::Author:
+ case QtMultimedia::ContributingArtist:
+ case QtMultimedia::Conductor:
+ case QtMultimedia::Lyrics:
+ case QtMultimedia::Mood:
+ case QtMultimedia::TrackCount:
+ case QtMultimedia::CoverArtUrlSmall:
+ case QtMultimedia::CoverArtUrlLarge:
+ case QtMultimedia::Resolution:
+ case QtMultimedia::PixelAspectRatio:
+ case QtMultimedia::VideoFrameRate:
+ case QtMultimedia::VideoCodec:
+ case QtMultimedia::PosterUrl:
+ case QtMultimedia::ChapterNumber:
+ case QtMultimedia::Director:
+ case QtMultimedia::LeadPerformer:
+ case QtMultimedia::Writer:
+ case QtMultimedia::CameraManufacturer:
+ case QtMultimedia::CameraModel:
+ case QtMultimedia::Event:
+ case QtMultimedia::Subject:
default:
break;
}