From 8ff5b88b27b83438bfe576eea824a4a4d47249ce Mon Sep 17 00:00:00 2001
From: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Date: Mon, 16 Jan 2012 16:40:47 +1000
Subject: Changed metadata keys type from enum to QString.

This allows to combine metaData and extendedMetaData
and simplify metadata handling on both backend and application sides.

Change-Id: I136eedc86c215be3485db101c43069ca7c82101b
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
---
 .../gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h')

diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h
index 76b3d4305..7cbc85676 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h
+++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h
@@ -57,13 +57,9 @@ public:
     bool isMetaDataAvailable() const { return true; }
     bool isWritable() const { return true; }
 
-    QVariant metaData(QtMultimedia::MetaData key) const;
-    void setMetaData(QtMultimedia::MetaData key, const QVariant &value);
-    QList<QtMultimedia::MetaData> availableMetaData() const;
-
-    QVariant extendedMetaData(QString const &name) const;
-    void setExtendedMetaData(QString const &name, QVariant const &value);
-    QStringList availableExtendedMetaData() const;
+    QVariant metaData(const QString &key) const;
+    void setMetaData(const QString &key, const QVariant &value);
+    QStringList availableMetaData() const;
 
 Q_SIGNALS:
     void metaDataChanged(const QMap<QByteArray, QVariant>&);
-- 
cgit v1.2.3