Change namespace; QtMedia -> QtMultimedia

3 files changed, 29 insertions, 29 deletions

diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
index e38f80f..456dcfd 100644
--- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
+++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
@@ -47,51 +47,51 @@
 
 struct QGstreamerMetaDataKeyLookup
 {
-    QtMedia::MetaData key;
+    QtMultimedia::MetaData key;
     const char *token;
 };
 
 static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
 {
-    { QtMedia::Title, GST_TAG_TITLE },
+    { QtMultimedia::Title, GST_TAG_TITLE },
     //{ QtMedia::SubTitle, 0 },
     //{ QtMedia::Author, 0 },
-    { QtMedia::Comment, GST_TAG_COMMENT },
-    { QtMedia::Description, GST_TAG_DESCRIPTION },
+    { QtMultimedia::Comment, GST_TAG_COMMENT },
+    { QtMultimedia::Description, GST_TAG_DESCRIPTION },
     //{ QtMedia::Category, 0 },
-    { QtMedia::Genre, GST_TAG_GENRE },
-    { QtMedia::Year, "year" },
+    { QtMultimedia::Genre, GST_TAG_GENRE },
+    { QtMultimedia::Year, "year" },
     //{ QtMedia::UserRating, 0 },
 
-    { QtMedia::Language, GST_TAG_LANGUAGE_CODE },
+    { QtMultimedia::Language, GST_TAG_LANGUAGE_CODE },
 
-    { QtMedia::Publisher, GST_TAG_ORGANIZATION },
-    { QtMedia::Copyright, GST_TAG_COPYRIGHT },
+    { QtMultimedia::Publisher, GST_TAG_ORGANIZATION },
+    { QtMultimedia::Copyright, GST_TAG_COPYRIGHT },
     //{ QtMedia::ParentalRating, 0 },
     //{ QtMedia::RatingOrganisation, 0 },
 
     // Media
     //{ QtMedia::Size, 0 },
     //{ QtMedia::MediaType, 0 },
-    { QtMedia::Duration, GST_TAG_DURATION },
+    { QtMultimedia::Duration, GST_TAG_DURATION },
 
     // Audio
-    { QtMedia::AudioBitRate, GST_TAG_BITRATE },
-    { QtMedia::AudioCodec, GST_TAG_AUDIO_CODEC },
+    { QtMultimedia::AudioBitRate, GST_TAG_BITRATE },
+    { QtMultimedia::AudioCodec, GST_TAG_AUDIO_CODEC },
     //{ QtMedia::ChannelCount, 0 },
     //{ QtMedia::Frequency, 0 },
 
     // Music
-    { QtMedia::AlbumTitle, GST_TAG_ALBUM },
-    { QtMedia::AlbumArtist,  GST_TAG_ARTIST},
-    { QtMedia::ContributingArtist, GST_TAG_PERFORMER },
+    { QtMultimedia::AlbumTitle, GST_TAG_ALBUM },
+    { QtMultimedia::AlbumArtist,  GST_TAG_ARTIST},
+    { QtMultimedia::ContributingArtist, GST_TAG_PERFORMER },
 #if (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19)
     { QtMedia::Composer, GST_TAG_COMPOSER },
 #endif
     //{ QtMedia::Conductor, 0 },
     //{ QtMedia::Lyrics, 0 },
     //{ QtMedia::Mood, 0 },
-    { QtMedia::TrackNumber, GST_TAG_TRACK_NUMBER },
+    { QtMultimedia::TrackNumber, GST_TAG_TRACK_NUMBER },
 
     //{ QtMedia::CoverArtUrlSmall, 0 },
     //{ QtMedia::CoverArtUrlLarge, 0 },
@@ -103,14 +103,14 @@ static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
     // Video
     //{ QtMedia::VideoFrameRate, 0 },
     //{ QtMedia::VideoBitRate, 0 },
-    { QtMedia::VideoCodec, GST_TAG_VIDEO_CODEC },
+    { QtMultimedia::VideoCodec, GST_TAG_VIDEO_CODEC },
 
     //{ QtMedia::PosterUrl, 0 },
 
     // Movie
     //{ QtMedia::ChapterNumber, 0 },
     //{ QtMedia::Director, 0 },
-    { QtMedia::LeadPerformer, GST_TAG_PERFORMER },
+    { QtMultimedia::LeadPerformer, GST_TAG_PERFORMER },
     //{ QtMedia::Writer, 0 },
 
     // Photos
@@ -140,7 +140,7 @@ bool QGstreamerMetaDataProvider::isWritable() const
     return false;
 }
 
-QVariant QGstreamerMetaDataProvider::metaData(QtMedia::MetaData key) const
+QVariant QGstreamerMetaDataProvider::metaData(QtMultimedia::MetaData key) const
 {
     static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
 
@@ -152,15 +152,15 @@ QVariant QGstreamerMetaDataProvider::metaData(QtMedia::MetaData key) const
     return QVariant();
 }
 
-void QGstreamerMetaDataProvider::setMetaData(QtMedia::MetaData key, QVariant const &value)
+void QGstreamerMetaDataProvider::setMetaData(QtMultimedia::MetaData key, QVariant const &value)
 {
     Q_UNUSED(key);
     Q_UNUSED(value);
 }
 
-QList<QtMedia::MetaData> QGstreamerMetaDataProvider::availableMetaData() const
+QList<QtMultimedia::MetaData> QGstreamerMetaDataProvider::availableMetaData() const
 {
-    static QMap<QByteArray, QtMedia::MetaData> keysMap;
+    static QMap<QByteArray, QtMultimedia::MetaData> keysMap;
     if (keysMap.isEmpty()) {
         const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
         for (int i = 0; i < count; ++i) {
@@ -168,9 +168,9 @@ QList<QtMedia::MetaData> QGstreamerMetaDataProvider::availableMetaData() const
         }
     }
 
-    QList<QtMedia::MetaData> res;
+    QList<QtMultimedia::MetaData> res;
     foreach (const QByteArray &key, m_session->tags().keys()) {
-        QtMedia::MetaData tag = keysMap.value(key, QtMedia::MetaData(-1));
+        QtMultimedia::MetaData tag = keysMap.value(key, QtMultimedia::MetaData(-1));
         if (tag != -1)
             res.append(tag);
     }
diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.h b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.h
index cdf82d9..267c2d7 100644
--- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.h
+++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.h
@@ -61,9 +61,9 @@ public:
     bool isMetaDataAvailable() const;
     bool isWritable() const;
 
-    QVariant metaData(QtMedia::MetaData key) const;
-    void setMetaData(QtMedia::MetaData key, const QVariant &value);
-    QList<QtMedia::MetaData> availableMetaData() const;
+    QVariant metaData(QtMultimedia::MetaData key) const;
+    void setMetaData(QtMultimedia::MetaData key, const QVariant &value);
+    QList<QtMultimedia::MetaData> availableMetaData() const;
 
     QVariant extendedMetaData(const QString &key) const ;
     void setExtendedMetaData(const QString &key, const QVariant &value);
diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.h b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.h
index e277ba9..d650ec7 100644
--- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.h
+++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.h
@@ -93,7 +93,7 @@ public:
     void setPlaybackRate(qreal rate);
 
     QMap<QByteArray ,QVariant> tags() const { return m_tags; }
-    QMap<QtMedia::MetaData,QVariant> streamProperties(int streamNumber) const { return m_streamProperties[streamNumber]; }
+    QMap<QtMultimedia::MetaData,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); }
 //
@@ -149,7 +149,7 @@ private:
     QGstreamerVideoRendererInterface *m_renderer;
 
     QMap<QByteArray, QVariant> m_tags;
-    QList< QMap<QtMedia::MetaData,QVariant> > m_streamProperties;
+    QList< QMap<QtMultimedia::MetaData,QVariant> > m_streamProperties;
 //    QList<QMediaStreamsControl::StreamType> m_streamTypes;
 //    QMap<QMediaStreamsControl::StreamType, int> m_playbin2StreamOffset;