Some fixes to meta data handling

Remove the year property, Date is much more useful
and complete (plus it's supported everywhere).

Fix some bugs in the gstreamer implementation.

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

2 files changed, 9 insertions, 5 deletions

diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp
index 580d7c390..f9a37216c 100644
--- a/examples/multimediawidgets/camera/camera.cpp
+++ b/examples/multimediawidgets/camera/camera.cpp
@@ -296,19 +296,19 @@ void Camera::updateRecorderState(QMediaEncoder::State state)
         ui->recordButton->setEnabled(true);
         ui->pauseButton->setEnabled(true);
         ui->stopButton->setEnabled(false);
-        ui->metaDataButton->setEnabled(false);
+        ui->metaDataButton->setEnabled(true);
         break;
     case QMediaEncoder::PausedState:
         ui->recordButton->setEnabled(true);
         ui->pauseButton->setEnabled(false);
         ui->stopButton->setEnabled(true);
-        ui->metaDataButton->setEnabled(true);
+        ui->metaDataButton->setEnabled(false);
         break;
     case QMediaEncoder::RecordingState:
         ui->recordButton->setEnabled(false);
         ui->pauseButton->setEnabled(true);
         ui->stopButton->setEnabled(true);
-        ui->metaDataButton->setEnabled(true);
+        ui->metaDataButton->setEnabled(false);
         break;
     }
 }
@@ -408,6 +408,10 @@ void Camera::saveMetaData()
                 QImage thumbnail(val);
                 data.insert(key, thumbnail);
             }
+            else if (i == QMediaMetaData::Date) {
+                QDateTime date = QDateTime::fromString(val);
+                data.insert(key, date);
+            }
             else {
                 data.insert(key, val);
             }
diff --git a/examples/multimediawidgets/camera/metadatadialog.cpp b/examples/multimediawidgets/camera/metadatadialog.cpp
index e0df6ba57..28d8db035 100644
--- a/examples/multimediawidgets/camera/metadatadialog.cpp
+++ b/examples/multimediawidgets/camera/metadatadialog.cpp
@@ -83,8 +83,8 @@ MetaDataDialog::MetaDataDialog(QWidget *parent)
                 m_metaDataFields[key]->setText(tr("Qt Camera Example"));
             else if (key == QMediaMetaData::Author)
                 m_metaDataFields[key]->setText(tr("The Qt Company"));
-            else if (key == QMediaMetaData::Year)
-                m_metaDataFields[key]->setText("2020");
+            else if (key == QMediaMetaData::Date)
+                m_metaDataFields[key]->setText(QDateTime::currentDateTime().toString());
             else if (key == QMediaMetaData::Date)
                 m_metaDataFields[key]->setText(QDate::currentDate().toString());
             metaDataLayout->addRow(label, m_metaDataFields[key]);