--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp	Fri May 14 16:41:33 2010 +0300
@@ -67,7 +67,7 @@
     return false;
 }
 
-QVariant S60MediaMetaDataProvider::metaData(QtMedia::MetaData key) const
+QVariant S60MediaMetaDataProvider::metaData(QtMediaServices::MetaData key) const
 {
     m_session = m_mediaPlayerResolver.PlayerSession();
     if (m_session && m_session->isMetadataAvailable())
@@ -75,21 +75,21 @@
     return QVariant();
 }
 
-void S60MediaMetaDataProvider::setMetaData(QtMedia::MetaData key, QVariant const &value)
+void S60MediaMetaDataProvider::setMetaData(QtMediaServices::MetaData key, QVariant const &value)
 {
     Q_UNUSED(key);
     Q_UNUSED(value);
 }
-QList<QtMedia::MetaData> S60MediaMetaDataProvider::availableMetaData() const
+QList<QtMediaServices::MetaData> S60MediaMetaDataProvider::availableMetaData() const
 {
     m_session = m_mediaPlayerResolver.PlayerSession();
-    QList<QtMedia::MetaData> metaDataTags;
+    QList<QtMediaServices::MetaData> metaDataTags;
     if (m_session && m_session->isMetadataAvailable()) {
-        for (int i = QtMedia::Title; i <= QtMedia::DeviceSettingDescription; i++) {
-            QString metaData = metaDataKeyAsString((QtMedia::MetaData)i);
+        for (int i = QtMediaServices::Title; i <= QtMediaServices::DeviceSettingDescription; i++) {
+            QString metaData = metaDataKeyAsString((QtMediaServices::MetaData)i);
             if (!metaData.isEmpty()) {
                 if (!m_session->metaData(metaData).toString().isEmpty()) {
-                    metaDataTags.append((QtMedia::MetaData)i);               
+                    metaDataTags.append((QtMediaServices::MetaData)i);               
                 }
             }
         }
@@ -119,59 +119,59 @@
     return QStringList();
 }
 
-QString S60MediaMetaDataProvider::metaDataKeyAsString(QtMedia::MetaData key) const
+QString S60MediaMetaDataProvider::metaDataKeyAsString(QtMediaServices::MetaData key) const
 {
     switch(key) {
-        case QtMedia::Title: return "title";
-        case QtMedia::AlbumArtist: return "artist";
-        case QtMedia::Comment: return "comment";
-        case QtMedia::Genre: return "genre";
-        case QtMedia::Year: return "year";
-        case QtMedia::Copyright: return "copyright";
-        case QtMedia::AlbumTitle: return "album";
-        case QtMedia::Composer: return "composer";
-        case QtMedia::TrackNumber: return "albumtrack";
-        case QtMedia::AudioBitRate: return "audiobitrate";
-        case QtMedia::VideoBitRate: return "videobitrate";
-        case QtMedia::Duration: return "duration";
-        case QtMedia::MediaType: return "contenttype";
-        case QtMedia::SubTitle: // TODO: Find the matching metadata keys
-        case QtMedia::Description:
-        case QtMedia::Category:
-        case QtMedia::Date:
-        case QtMedia::UserRating:
-        case QtMedia::Keywords:
-        case QtMedia::Language:
-        case QtMedia::Publisher:
-        case QtMedia::ParentalRating:
-        case QtMedia::RatingOrganisation:
-        case QtMedia::Size:
-        case QtMedia::AudioCodec:
-        case QtMedia::AverageLevel:
-        case QtMedia::ChannelCount:
-        case QtMedia::PeakValue:
-        case QtMedia::SampleRate:
-        case QtMedia::Author:
-        case QtMedia::ContributingArtist:
-        case QtMedia::Conductor:
-        case QtMedia::Lyrics:
-        case QtMedia::Mood:
-        case QtMedia::TrackCount:
-        case QtMedia::CoverArtUrlSmall:
-        case QtMedia::CoverArtUrlLarge:
-        case QtMedia::Resolution:
-        case QtMedia::PixelAspectRatio:
-        case QtMedia::VideoFrameRate:
-        case QtMedia::VideoCodec:
-        case QtMedia::PosterUrl:
-        case QtMedia::ChapterNumber:
-        case QtMedia::Director:
-        case QtMedia::LeadPerformer:
-        case QtMedia::Writer:
-        case QtMedia::CameraManufacturer:
-        case QtMedia::CameraModel:
-        case QtMedia::Event:
-        case QtMedia::Subject:
+        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:
         default:
             break;
     }