diff -r 2b40d63a9c3d -r 90517678cc4f qtmobility/plugins/multimedia/symbian/mediaplayer/s60mediametadataprovider.cpp
--- a/qtmobility/plugins/multimedia/symbian/mediaplayer/s60mediametadataprovider.cpp	Fri Apr 16 15:51:22 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "s60mediametadataprovider.h"
-#include "s60mediaplayersession.h"
-#include <QtCore/qdebug.h>
-
-S60MediaMetaDataProvider::S60MediaMetaDataProvider(MS60MediaPlayerResolver& mediaPlayerResolver, QObject *parent)
-    : QMetaDataControl(parent)
-    , m_mediaPlayerResolver(mediaPlayerResolver)
-    , m_session(NULL)
-{
-}
-
-S60MediaMetaDataProvider::~S60MediaMetaDataProvider()
-{
-}
-
-bool S60MediaMetaDataProvider::isMetaDataAvailable() const
-{
-    m_session = m_mediaPlayerResolver.PlayerSession();
-    if (m_session)
-       return m_session->isMetadataAvailable();
-    return false;
-}
-
-bool S60MediaMetaDataProvider::isWritable() const
-{
-    return false;
-}
-
-QVariant S60MediaMetaDataProvider::metaData(QtMedia::MetaData key) const
-{
-    m_session = m_mediaPlayerResolver.PlayerSession();
-    if (m_session && m_session->isMetadataAvailable())
-        return m_session->metaData(metaDataKeyAsString(key));
-    return QVariant();
-}
-
-void S60MediaMetaDataProvider::setMetaData(QtMedia::MetaData key, QVariant const &value)
-{
-    Q_UNUSED(key);
-    Q_UNUSED(value);
-}
-QList<QtMedia::MetaData> S60MediaMetaDataProvider::availableMetaData() const
-{
-    m_session = m_mediaPlayerResolver.PlayerSession();
-    QList<QtMedia::MetaData> metaDataTags;
-    if (m_session && m_session->isMetadataAvailable()) {
-        for (int i = QtMedia::Title; i <= QtMedia::DeviceSettingDescription; i++) {
-            QString metaData = metaDataKeyAsString((QtMedia::MetaData)i);
-            if (!metaData.isEmpty()) {
-                if (!m_session->metaData(metaData).toString().isEmpty()) {
-                    metaDataTags.append((QtMedia::MetaData)i);               
-                }
-            }
-        }
-    }
-    return metaDataTags;
-}
-
-QVariant S60MediaMetaDataProvider::extendedMetaData(const QString &key) const
-{
-    m_session = m_mediaPlayerResolver.PlayerSession();
-    if (m_session && m_session->isMetadataAvailable())
-        return m_session->metaData(key);
-    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();
-    if (m_session && m_session->isMetadataAvailable())
-        return m_session->availableMetaData().keys();
-    return QStringList();
-}
-
-QString S60MediaMetaDataProvider::metaDataKeyAsString(QtMedia::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:
-        default:
-            break;
-    }
-
-    return QString();
-}