--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h Wed Jun 23 19:08:38 2010 +0300
@@ -42,17 +42,17 @@
#ifndef S60MEDIAMETADATAPROVIDER_H
#define S60MEDIAMETADATAPROVIDER_H
-#include <qmetadatacontrol.h>
+#include <qmetadatareadercontrol.h>
#include "ms60mediaplayerresolver.h"
QT_USE_NAMESPACE
class S60MediaPlayerSession;
-class S60MediaMetaDataProvider : public QMetaDataControl
+class S60MediaMetaDataProvider : public QMetaDataReaderControl
{
Q_OBJECT
-
+
public:
S60MediaMetaDataProvider(MS60MediaPlayerResolver& mediaPlayerResolver, QObject *parent = 0);
~S60MediaMetaDataProvider();
@@ -60,16 +60,13 @@
bool isMetaDataAvailable() const;
bool isWritable() const;
- QVariant metaData(QtMediaServices::MetaData key) const;
- void setMetaData(QtMediaServices::MetaData key, const QVariant &value);
- QList<QtMediaServices::MetaData> availableMetaData() const;
-
+ QVariant metaData(QtMultimedia::MetaData key) const;
+ QList<QtMultimedia::MetaData> availableMetaData() const;
QVariant extendedMetaData(const QString &key) const ;
- void setExtendedMetaData(const QString &key, const QVariant &value);
QStringList availableExtendedMetaData() const;
-
+
private:
- QString metaDataKeyAsString(QtMediaServices::MetaData key) const;
+ QString metaDataKeyAsString(QtMultimedia::MetaData key) const;
private:
MS60MediaPlayerResolver& m_mediaPlayerResolver;