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>

6 files changed, 64 insertions, 81 deletions

diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
index 6da2919a3..f53ccaed9 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
@@ -49,77 +49,77 @@ QT_BEGIN_NAMESPACE
 
 struct QGstreamerMetaDataKeyLookup
 {
-    QtMultimedia::MetaData key;
+    QString key;
     const char *token;
 };
 
 static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
 {
-    { QtMultimedia::Title, GST_TAG_TITLE },
-    //{ QtMultimedia::SubTitle, 0 },
-    //{ QtMultimedia::Author, 0 },
-    { QtMultimedia::Comment, GST_TAG_COMMENT },
-    { QtMultimedia::Description, GST_TAG_DESCRIPTION },
-    //{ QtMultimedia::Category, 0 },
-    { QtMultimedia::Genre, GST_TAG_GENRE },
-    { QtMultimedia::Year, "year" },
-    //{ QtMultimedia::UserRating, 0 },
-
-    { QtMultimedia::Language, GST_TAG_LANGUAGE_CODE },
-
-    { QtMultimedia::Publisher, GST_TAG_ORGANIZATION },
-    { QtMultimedia::Copyright, GST_TAG_COPYRIGHT },
-    //{ QtMultimedia::ParentalRating, 0 },
-    //{ QtMultimedia::RatingOrganization, 0 },
+    { QtMultimedia::MetaData::Title, GST_TAG_TITLE },
+    //{ QtMultimedia::MetaData::SubTitle, 0 },
+    //{ QtMultimedia::MetaData::Author, 0 },
+    { QtMultimedia::MetaData::Comment, GST_TAG_COMMENT },
+    { QtMultimedia::MetaData::Description, GST_TAG_DESCRIPTION },
+    //{ QtMultimedia::MetaData::Category, 0 },
+    { QtMultimedia::MetaData::Genre, GST_TAG_GENRE },
+    { QtMultimedia::MetaData::Year, "year" },
+    //{ QtMultimedia::MetaData::UserRating, 0 },
+
+    { QtMultimedia::MetaData::Language, GST_TAG_LANGUAGE_CODE },
+
+    { QtMultimedia::MetaData::Publisher, GST_TAG_ORGANIZATION },
+    { QtMultimedia::MetaData::Copyright, GST_TAG_COPYRIGHT },
+    //{ QtMultimedia::MetaData::ParentalRating, 0 },
+    //{ QtMultimedia::MetaData::RatingOrganisation, 0 },
 
     // Media
-    //{ QtMultimedia::Size, 0 },
-    //{ QtMultimedia::MediaType, 0 },
-    { QtMultimedia::Duration, GST_TAG_DURATION },
+    //{ QtMultimedia::MetaData::Size, 0 },
+    //{ QtMultimedia::MetaData::MediaType, 0 },
+    { QtMultimedia::MetaData::Duration, GST_TAG_DURATION },
 
     // Audio
-    { QtMultimedia::AudioBitRate, GST_TAG_BITRATE },
-    { QtMultimedia::AudioCodec, GST_TAG_AUDIO_CODEC },
-    //{ QtMultimedia::ChannelCount, 0 },
-    //{ QtMultimedia::SampleRate, 0 },
+    { QtMultimedia::MetaData::AudioBitRate, GST_TAG_BITRATE },
+    { QtMultimedia::MetaData::AudioCodec, GST_TAG_AUDIO_CODEC },
+    //{ QtMultimedia::MetaData::ChannelCount, 0 },
+    //{ QtMultimedia::MetaData::SampleRate, 0 },
 
     // Music
-    { QtMultimedia::AlbumTitle, GST_TAG_ALBUM },
-    { QtMultimedia::AlbumArtist,  GST_TAG_ARTIST},
-    { QtMultimedia::ContributingArtist, GST_TAG_PERFORMER },
+    { QtMultimedia::MetaData::AlbumTitle, GST_TAG_ALBUM },
+    { QtMultimedia::MetaData::AlbumArtist,  GST_TAG_ARTIST},
+    { QtMultimedia::MetaData::ContributingArtist, GST_TAG_PERFORMER },
 #if (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19)
-    { QtMultimedia::Composer, GST_TAG_COMPOSER },
+    { QtMultimedia::MetaData::Composer, GST_TAG_COMPOSER },
 #endif
-    //{ QtMultimedia::Conductor, 0 },
-    //{ QtMultimedia::Lyrics, 0 },
-    //{ QtMultimedia::Mood, 0 },
-    { QtMultimedia::TrackNumber, GST_TAG_TRACK_NUMBER },
+    //{ QtMultimedia::MetaData::Conductor, 0 },
+    //{ QtMultimedia::MetaData::Lyrics, 0 },
+    //{ QtMultimedia::MetaData::Mood, 0 },
+    { QtMultimedia::MetaData::TrackNumber, GST_TAG_TRACK_NUMBER },
 
-    //{ QtMultimedia::CoverArtUrlSmall, 0 },
-    //{ QtMultimedia::CoverArtUrlLarge, 0 },
+    //{ QtMultimedia::MetaData::CoverArtUrlSmall, 0 },
+    //{ QtMultimedia::MetaData::CoverArtUrlLarge, 0 },
 
     // Image/Video
-    { QtMultimedia::Resolution, "resolution" },
-    { QtMultimedia::PixelAspectRatio, "pixel-aspect-ratio" },
+    { QtMultimedia::MetaData::Resolution, "resolution" },
+    { QtMultimedia::MetaData::PixelAspectRatio, "pixel-aspect-ratio" },
 
     // Video
-    //{ QtMultimedia::VideoFrameRate, 0 },
-    //{ QtMultimedia::VideoBitRate, 0 },
-    { QtMultimedia::VideoCodec, GST_TAG_VIDEO_CODEC },
+    //{ QtMultimedia::MetaData::VideoFrameRate, 0 },
+    //{ QtMultimedia::MetaData::VideoBitRate, 0 },
+    { QtMultimedia::MetaData::VideoCodec, GST_TAG_VIDEO_CODEC },
 
-    //{ QtMultimedia::PosterUrl, 0 },
+    //{ QtMultimedia::MetaData::PosterUrl, 0 },
 
     // Movie
-    //{ QtMultimedia::ChapterNumber, 0 },
-    //{ QtMultimedia::Director, 0 },
-    { QtMultimedia::LeadPerformer, GST_TAG_PERFORMER },
-    //{ QtMultimedia::Writer, 0 },
+    //{ QtMultimedia::MetaData::ChapterNumber, 0 },
+    //{ QtMultimedia::MetaData::Director, 0 },
+    { QtMultimedia::MetaData::LeadPerformer, GST_TAG_PERFORMER },
+    //{ QtMultimedia::MetaData::Writer, 0 },
 
     // Photos
-    //{ QtMultimedia::CameraManufacturer, 0 },
-    //{ QtMultimedia::CameraModel, 0 },
-    //{ QtMultimedia::Event, 0 },
-    //{ QtMultimedia::Subject, 0 }
+    //{ QtMultimedia::MetaData::CameraManufacturer, 0 },
+    //{ QtMultimedia::MetaData::CameraModel, 0 },
+    //{ QtMultimedia::MetaData::Event, 0 },
+    //{ QtMultimedia::MetaData::Subject, 0 }
 };
 
 QGstreamerMetaDataProvider::QGstreamerMetaDataProvider(QGstreamerPlayerSession *session, QObject *parent)
@@ -142,7 +142,7 @@ bool QGstreamerMetaDataProvider::isWritable() const
     return false;
 }
 
-QVariant QGstreamerMetaDataProvider::metaData(QtMultimedia::MetaData key) const
+QVariant QGstreamerMetaDataProvider::metaData(const QString &key) const
 {
     static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
 
@@ -154,9 +154,9 @@ QVariant QGstreamerMetaDataProvider::metaData(QtMultimedia::MetaData key) const
     return QVariant();
 }
 
-QList<QtMultimedia::MetaData> QGstreamerMetaDataProvider::availableMetaData() const
+QStringList QGstreamerMetaDataProvider::availableMetaData() const
 {
-    static QMap<QByteArray, QtMultimedia::MetaData> keysMap;
+    static QMap<QByteArray, QString> keysMap;
     if (keysMap.isEmpty()) {
         const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
         for (int i = 0; i < count; ++i) {
@@ -164,30 +164,16 @@ QList<QtMultimedia::MetaData> QGstreamerMetaDataProvider::availableMetaData() co
         }
     }
 
-    QList<QtMultimedia::MetaData> res;
+    QStringList res;
     foreach (const QByteArray &key, m_session->tags().keys()) {
-        QtMultimedia::MetaData tag = keysMap.value(key, QtMultimedia::MetaData(-1));
-        if (tag != -1)
+        QString tag = keysMap.value(key);
+        if (!tag.isEmpty())
             res.append(tag);
     }
 
     return res;
 }
 
-QVariant QGstreamerMetaDataProvider::extendedMetaData(const QString &key) const
-{
-    return m_session->tags().value(key.toLatin1());
-}
-
-QStringList QGstreamerMetaDataProvider::availableExtendedMetaData() const
-{
-    QStringList res;
-    foreach (const QByteArray &key, m_session->tags().keys())
-        res.append(QString(key));
-
-    return res;
-}
-
 void QGstreamerMetaDataProvider::updateTags()
 {
     emit metaDataChanged();
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h
index a9dbddaaf..eabc888bc 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h
@@ -58,11 +58,8 @@ public:
     bool isMetaDataAvailable() const;
     bool isWritable() const;
 
-    QVariant metaData(QtMultimedia::MetaData key) const;
-    QList<QtMultimedia::MetaData> availableMetaData() const;
-
-    QVariant extendedMetaData(const QString &key) const ;
-    QStringList availableExtendedMetaData() const;
+    QVariant metaData(const QString &key) const;
+    QStringList availableMetaData() const;
 
 private slots:
     void updateTags();
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
index 8a48064c7..88f6bc578 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
@@ -1221,7 +1221,7 @@ void QGstreamerPlayerSession::getStreamsInfo()
 
         for (int i=0; i<m_streamTypes.count(); i++) {
             QMediaStreamsControl::StreamType streamType = m_streamTypes[i];
-            QMap<QtMultimedia::MetaData, QVariant> streamProperties;
+            QMap<QString, QVariant> streamProperties;
 
             int streamIndex = i - m_playbin2StreamOffset[streamType];
 
@@ -1243,7 +1243,7 @@ void QGstreamerPlayerSession::getStreamsInfo()
             if (tags && gst_is_tag_list(tags)) {
                 gchar *languageCode = 0;
                 if (gst_tag_list_get_string(tags, GST_TAG_LANGUAGE_CODE, &languageCode))
-                    streamProperties[QtMultimedia::Language] = QString::fromUtf8(languageCode);
+                    streamProperties[QtMultimedia::MetaData::Language] = QString::fromUtf8(languageCode);
 
                 //qDebug() << "language for setream" << i << QString::fromUtf8(languageCode);
                 g_free (languageCode);
@@ -1303,8 +1303,8 @@ void QGstreamerPlayerSession::getStreamsInfo()
                 break;
             }
 
-            QMap<QtMultimedia::MetaData, QVariant> streamProperties;
-            streamProperties[QtMultimedia::Language] = QString::fromUtf8(languageCode);
+            QMap<QString, QVariant> streamProperties;
+            streamProperties[QtMultimedia::MetaData::Language] = QString::fromUtf8(languageCode);
 
             m_streamProperties.append(streamProperties);
             m_streamTypes.append(streamType);
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h
index 063a9ab39..921677a6d 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h
@@ -103,7 +103,7 @@ public:
     QMediaTimeRange availablePlaybackRanges() const;
 
     QMap<QByteArray ,QVariant> tags() const { return m_tags; }
-    QMap<QtMultimedia::MetaData,QVariant> streamProperties(int streamNumber) const { return m_streamProperties[streamNumber]; }
+    QMap<QString,QVariant> streamProperties(int streamNumber) const { return m_streamProperties[streamNumber]; }
     int streamCount() const { return m_streamProperties.count(); }
     QMediaStreamsControl::StreamType streamType(int streamNumber) { return m_streamTypes.value(streamNumber, QMediaStreamsControl::UnknownStream); }
 
@@ -195,7 +195,7 @@ private:
 #endif
 
     QMap<QByteArray, QVariant> m_tags;
-    QList< QMap<QtMultimedia::MetaData,QVariant> > m_streamProperties;
+    QList< QMap<QString,QVariant> > m_streamProperties;
     QList<QMediaStreamsControl::StreamType> m_streamTypes;
     QMap<QMediaStreamsControl::StreamType, int> m_playbin2StreamOffset;
 
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp
index 55a8aedc8..f3e993614 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp
@@ -62,7 +62,7 @@ QMediaStreamsControl::StreamType QGstreamerStreamsControl::streamType(int stream
     return m_session->streamType(streamNumber);
 }
 
-QVariant QGstreamerStreamsControl::metaData(int streamNumber, QtMultimedia::MetaData key)
+QVariant QGstreamerStreamsControl::metaData(int streamNumber, const QString &key)
 {
     return m_session->streamProperties(streamNumber).value(key);
 }
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h b/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h
index 36084edd1..8726c0697 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h
@@ -58,7 +58,7 @@ public:
     virtual int streamCount();
     virtual StreamType streamType(int streamNumber);
 
-    virtual QVariant metaData(int streamNumber, QtMultimedia::MetaData key);
+    virtual QVariant metaData(int streamNumber, const QString &key);
 
     virtual bool isActive(int streamNumber);
     virtual void setActive(int streamNumber, bool state);