Rework the metadata handling

Get rid of metadata reader and writer controls. Instead use
a simple cross platform value class to store meta data.
The backend can then convert to and from whatever the native
API expects.

Change-Id: I7cf84bfbe8eef2a88615a52ba5afeec50a0652c8
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 5 insertions, 11 deletions

diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h
index 65499398c..303dd3dea 100644
--- a/src/multimedia/recording/qmediarecorder.h
+++ b/src/multimedia/recording/qmediarecorder.h
@@ -45,6 +45,7 @@
 #include <QtMultimedia/qmediaencodersettings.h>
 #include <QtMultimedia/qmediasink.h>
 #include <QtMultimedia/qmediaenumdebug.h>
+#include <QtMultimedia/qmediametadata.h>
 
 #include <QtCore/qpair.h>
 
@@ -78,8 +79,7 @@ class Q_MULTIMEDIA_EXPORT QMediaRecorder : public QObject, public QMediaSink
     Q_PROPERTY(QUrl actualLocation READ actualLocation NOTIFY actualLocationChanged)
     Q_PROPERTY(bool muted READ isMuted WRITE setMuted NOTIFY mutedChanged)
     Q_PROPERTY(qreal volume READ volume WRITE setVolume NOTIFY volumeChanged)
-    Q_PROPERTY(bool metaDataAvailable READ isMetaDataAvailable NOTIFY metaDataAvailableChanged)
-    Q_PROPERTY(bool metaDataWritable READ isMetaDataWritable NOTIFY metaDataWritableChanged)
+    Q_PROPERTY(QMediaMetaData metaData READ metaData WRITE setMetaData NOTIFY metaDataChanged)
     Q_PROPERTY(QAudioDeviceInfo audioInput READ audioInput WRITE setAudioInput NOTIFY audioInputChanged)
 public:
 
@@ -143,12 +143,9 @@ public:
     void setEncoderSettings(const QMediaEncoderSettings &);
     QMediaEncoderSettings encoderSettings() const;
 
-    bool isMetaDataAvailable() const;
-    bool isMetaDataWritable() const;
-
-    QVariant metaData(const QString &key) const;
-    void setMetaData(const QString &key, const QVariant &value);
-    QStringList availableMetaData() const;
+    QMediaMetaData metaData() const;
+    void setMetaData(const QMediaMetaData &metaData);
+    void addMetaData(const QMediaMetaData &metaData);
 
     QAudioDeviceInfo audioInput() const;
     QCameraInfo videoInput() const;
@@ -172,10 +169,7 @@ Q_SIGNALS:
 
     void error(QMediaRecorder::Error error);
 
-    void metaDataAvailableChanged(bool available);
-    void metaDataWritableChanged(bool writable);
     void metaDataChanged();
-    void metaDataChanged(const QString &key, const QVariant &value);
 
 protected:
     QMediaRecorder(QMediaRecorderPrivate &dd, QMediaSource *mediaSource, QObject *parent = nullptr);