diff -r 06b8e2af4411 -r 6fbed849b4f4 qtmobility/plugins/multimedia/directshow/player/directshowmetadatacontrol.h --- a/qtmobility/plugins/multimedia/directshow/player/directshowmetadatacontrol.h Fri Jun 11 14:26:25 2010 +0300 +++ b/qtmobility/plugins/multimedia/directshow/player/directshowmetadatacontrol.h Wed Jun 23 19:08:38 2010 +0300 @@ -42,7 +42,7 @@ #ifndef DIRECTSHOWMETADATACONTROL_H #define DIRECTSHOWMETADATACONTROL_H -#include "../../src/multimedia/qmetadatacontrol.h" +#include #include "directshowglobal.h" @@ -58,22 +58,19 @@ QT_USE_NAMESPACE -class DirectShowMetaDataControl : public QMetaDataControl +class DirectShowMetaDataControl : public QMetaDataReaderControl { Q_OBJECT public: DirectShowMetaDataControl(QObject *parent = 0); ~DirectShowMetaDataControl(); - bool isWritable() const; bool isMetaDataAvailable() const; - QVariant metaData(QtMediaServices::MetaData key) const; - void setMetaData(QtMediaServices::MetaData key, const QVariant &value); - QList availableMetaData() const; + QVariant metaData(QtMultimedia::MetaData key) const; + QList availableMetaData() const; QVariant extendedMetaData(const QString &key) const; - void setExtendedMetaData(const QString &key, const QVariant &value); QStringList availableExtendedMetaData() const; void updateGraph(IFilterGraph2 *graph, IBaseFilter *source);