Added metaDataChanged(key,value) signal to metadata controls.

It may be more efficient and convenient for application to use this
signal instead of metaDataChanged().

metaDataChanged() signal is emitted for compatibility,
backends should emit both signals.

Signal added QMetadataReader/WritterControl,
QMediaObject and QMediaRecorder.

Change-Id: I5ca34a40e64b22034e6fde8cd7f9735cc3f72c68
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

8 files changed, 52 insertions, 0 deletions

diff --git a/src/multimedia/controls/qmetadatareadercontrol.cpp b/src/multimedia/controls/qmetadatareadercontrol.cpp
index 9ff297aa9..a173a933f 100644
--- a/src/multimedia/controls/qmetadatareadercontrol.cpp
+++ b/src/multimedia/controls/qmetadatareadercontrol.cpp
@@ -126,6 +126,16 @@ QMetaDataReaderControl::~QMetaDataReaderControl()
     \fn void QMetaDataReaderControl::metaDataChanged()
 
     Signal the changes of meta-data.
+
+    If multiple meta-data elements are changed,
+    metaDataChanged(const QString &key, const QVariant &value) signal is emitted
+    for each of them with metaDataChanged() changed emitted once.
+*/
+
+/*!
+    \fn void QMetaDataReaderControl::metaDataChanged(const QString &key, const QVariant &value)
+
+    Signal the changes of one meta-data element \a value with the given \a key.
 */
 
 /*!
diff --git a/src/multimedia/controls/qmetadatareadercontrol.h b/src/multimedia/controls/qmetadatareadercontrol.h
index fe5b0418a..331bd90a6 100644
--- a/src/multimedia/controls/qmetadatareadercontrol.h
+++ b/src/multimedia/controls/qmetadatareadercontrol.h
@@ -71,6 +71,7 @@ public:
 
 Q_SIGNALS:
     void metaDataChanged();
+    void metaDataChanged(const QString &key, const QVariant &value);
 
     void metaDataAvailableChanged(bool available);
 
diff --git a/src/multimedia/controls/qmetadatawritercontrol.cpp b/src/multimedia/controls/qmetadatawritercontrol.cpp
index 2ac727f6d..06439626f 100644
--- a/src/multimedia/controls/qmetadatawritercontrol.cpp
+++ b/src/multimedia/controls/qmetadatawritercontrol.cpp
@@ -139,6 +139,16 @@ QMetaDataWriterControl::~QMetaDataWriterControl()
     \fn void QMetaDataWriterControl::metaDataChanged()
 
     Signal the changes of meta-data.
+
+    If multiple meta-data elements are changed,
+    metaDataChanged(const QString &key, const QVariant &value) signal is emitted
+    for each of them with metaDataChanged() changed emitted once.
+*/
+
+/*!
+    \fn void QMetaDataWriterControl::metaDataChanged(const QString &key, const QVariant &value)
+
+    Signal the changes of one meta-data element \a value with the given \a key.
 */
 
 /*!
diff --git a/src/multimedia/controls/qmetadatawritercontrol.h b/src/multimedia/controls/qmetadatawritercontrol.h
index d642759fe..fe451d52b 100644
--- a/src/multimedia/controls/qmetadatawritercontrol.h
+++ b/src/multimedia/controls/qmetadatawritercontrol.h
@@ -73,6 +73,7 @@ public:
 
 Q_SIGNALS:
     void metaDataChanged();
+    void metaDataChanged(const QString &key, const QVariant &value);
 
     void writableChanged(bool writable);
     void metaDataAvailableChanged(bool available);
diff --git a/src/multimedia/qmediaobject.cpp b/src/multimedia/qmediaobject.cpp
index cad9628f3..b957e9573 100644
--- a/src/multimedia/qmediaobject.cpp
+++ b/src/multimedia/qmediaobject.cpp
@@ -347,8 +347,19 @@ QStringList QMediaObject::availableMetaData() const
     \fn QMediaObject::metaDataChanged()
 
     Signals that this media object's meta-data has changed.
+
+    If multiple meta-data elements are changed,
+    metaDataChanged(const QString &key, const QVariant &value) signal is emitted
+    for each of them with metaDataChanged() changed emitted once.
 */
 
+/*!
+    \fn QMediaObject::metaDataChanged(const QString &key, const QVariant &value)
+
+    Signal the changes of one meta-data element \a value with the given \a key.
+*/
+
+
 void QMediaObject::setupMetaData()
 {
     Q_D(QMediaObject);
@@ -360,6 +371,9 @@ void QMediaObject::setupMetaData()
         if (d->metaDataControl) {
             connect(d->metaDataControl, SIGNAL(metaDataChanged()), SIGNAL(metaDataChanged()));
             connect(d->metaDataControl,
+                    SIGNAL(metaDataChanged(QString,QVariant)),
+                    SIGNAL(metaDataChanged(QString,QVariant)));
+            connect(d->metaDataControl,
                     SIGNAL(metaDataAvailableChanged(bool)),
                     SIGNAL(metaDataAvailableChanged(bool)));
         }
diff --git a/src/multimedia/qmediaobject.h b/src/multimedia/qmediaobject.h
index 7efb2572f..f1805da17 100644
--- a/src/multimedia/qmediaobject.h
+++ b/src/multimedia/qmediaobject.h
@@ -87,6 +87,7 @@ Q_SIGNALS:
 
     void metaDataAvailableChanged(bool available);
     void metaDataChanged();
+    void metaDataChanged(const QString &key, const QVariant &value);
 
     void availabilityChanged(bool available);
 
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp
index 2bdb50b74..0360fe155 100644
--- a/src/multimedia/recording/qmediarecorder.cpp
+++ b/src/multimedia/recording/qmediarecorder.cpp
@@ -290,6 +290,8 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object)
             if (d->metaDataControl) {
                 disconnect(d->metaDataControl, SIGNAL(metaDataChanged()),
                         this, SIGNAL(metaDataChanged()));
+                disconnect(d->metaDataControl, SIGNAL(metaDataChanged(QString,QVariant)),
+                        this, SIGNAL(metaDataChanged(QString,QVariant)));
                 disconnect(d->metaDataControl, SIGNAL(metaDataAvailableChanged(bool)),
                         this, SIGNAL(metaDataAvailableChanged(bool)));
                 disconnect(d->metaDataControl, SIGNAL(writableChanged(bool)),
@@ -331,6 +333,8 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object)
                         connect(d->metaDataControl,
                                 SIGNAL(metaDataChanged()),
                                 SIGNAL(metaDataChanged()));
+                        connect(d->metaDataControl, SIGNAL(metaDataChanged(QString,QVariant)),
+                                this, SIGNAL(metaDataChanged(QString,QVariant)));
                         connect(d->metaDataControl,
                                 SIGNAL(metaDataAvailableChanged(bool)),
                                 SIGNAL(metaDataAvailableChanged(bool)));
@@ -939,6 +943,16 @@ QStringList QMediaRecorder::availableMetaData() const
     \fn QMediaRecorder::metaDataChanged()
 
     Signals that a media object's meta-data has changed.
+
+    If multiple meta-data elements are changed,
+    metaDataChanged(const QString &key, const QVariant &value) signal is emitted
+    for each of them with metaDataChanged() changed emitted once.
+*/
+
+/*!
+    \fn QMediaRecorder::metaDataChanged(const QString &key, const QVariant &value)
+
+    Signal the changes of one meta-data element \a value with the given \a key.
 */
 
 #include "moc_qmediarecorder.cpp"
diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h
index 3b210ddc6..1aac73cf2 100644
--- a/src/multimedia/recording/qmediarecorder.h
+++ b/src/multimedia/recording/qmediarecorder.h
@@ -171,6 +171,7 @@ Q_SIGNALS:
     void metaDataAvailableChanged(bool available);
     void metaDataWritableChanged(bool writable);
     void metaDataChanged();
+    void metaDataChanged(const QString &key, const QVariant &value);
 
 protected:
     QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = 0);