diff options
author | Sze Howe Koh <szehowe.koh@gmail.com> | 2012-10-31 19:37:48 +0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-06 18:19:57 +0100 |
commit | 00d709216335b68b5eb81ae9bf726c82a079e12c (patch) | |
tree | 571dcc87ca419e092512c62c76864fceff49088a /src/plugins/gstreamer/mediaplayer | |
parent | 0affd9023ff1146c822cd188612c7727947ea618 (diff) |
Rename namespace QtMultimedia::MetaData -> QMediaMetaData
Main code, examples, tests and docs updated. Method:
1. Remove unused forward-declarations, "class QMediaMetaData"
2. Mass find+replace "QtMultimedia::MetaData" -> "QMediaMetaData"
3. Un-nest from the QtMultimedia namespace in qtmedianamespace.h
For consistency (with minimal disruption), namespaces with a "Qt" prefix
will be renamed. Also, Qt guidelines don't include nested namespaces
(http://lists.qt-project.org/pipermail/development/2012-October/006756.html)
Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)
Change-Id: I40e59c1cf58c1792725e735e9285c51bc5f226b1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/plugins/gstreamer/mediaplayer')
3 files changed, 48 insertions, 49 deletions
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp index 278801de6..622142645 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp @@ -55,71 +55,71 @@ struct QGstreamerMetaDataKeyLookup static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] = { - { 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 }, + { QMediaMetaData::Title, GST_TAG_TITLE }, + //{ QMediaMetaData::SubTitle, 0 }, + //{ QMediaMetaData::Author, 0 }, + { QMediaMetaData::Comment, GST_TAG_COMMENT }, + { QMediaMetaData::Description, GST_TAG_DESCRIPTION }, + //{ QMediaMetaData::Category, 0 }, + { QMediaMetaData::Genre, GST_TAG_GENRE }, + { QMediaMetaData::Year, "year" }, + //{ QMediaMetaData::UserRating, 0 }, + + { QMediaMetaData::Language, GST_TAG_LANGUAGE_CODE }, + + { QMediaMetaData::Publisher, GST_TAG_ORGANIZATION }, + { QMediaMetaData::Copyright, GST_TAG_COPYRIGHT }, + //{ QMediaMetaData::ParentalRating, 0 }, + //{ QMediaMetaData::RatingOrganisation, 0 }, // Media - //{ QtMultimedia::MetaData::Size, 0 }, - //{ QtMultimedia::MetaData::MediaType, 0 }, - { QtMultimedia::MetaData::Duration, GST_TAG_DURATION }, + //{ QMediaMetaData::Size, 0 }, + //{ QMediaMetaData::MediaType, 0 }, + { QMediaMetaData::Duration, GST_TAG_DURATION }, // Audio - { QtMultimedia::MetaData::AudioBitRate, GST_TAG_BITRATE }, - { QtMultimedia::MetaData::AudioCodec, GST_TAG_AUDIO_CODEC }, - //{ QtMultimedia::MetaData::ChannelCount, 0 }, - //{ QtMultimedia::MetaData::SampleRate, 0 }, + { QMediaMetaData::AudioBitRate, GST_TAG_BITRATE }, + { QMediaMetaData::AudioCodec, GST_TAG_AUDIO_CODEC }, + //{ QMediaMetaData::ChannelCount, 0 }, + //{ QMediaMetaData::SampleRate, 0 }, // Music - { QtMultimedia::MetaData::AlbumTitle, GST_TAG_ALBUM }, - { QtMultimedia::MetaData::AlbumArtist, GST_TAG_ARTIST}, - { QtMultimedia::MetaData::ContributingArtist, GST_TAG_PERFORMER }, + { QMediaMetaData::AlbumTitle, GST_TAG_ALBUM }, + { QMediaMetaData::AlbumArtist, GST_TAG_ARTIST}, + { QMediaMetaData::ContributingArtist, GST_TAG_PERFORMER }, #if (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19) - { QtMultimedia::MetaData::Composer, GST_TAG_COMPOSER }, + { QMediaMetaData::Composer, GST_TAG_COMPOSER }, #endif - //{ QtMultimedia::MetaData::Conductor, 0 }, - //{ QtMultimedia::MetaData::Lyrics, 0 }, - //{ QtMultimedia::MetaData::Mood, 0 }, - { QtMultimedia::MetaData::TrackNumber, GST_TAG_TRACK_NUMBER }, + //{ QMediaMetaData::Conductor, 0 }, + //{ QMediaMetaData::Lyrics, 0 }, + //{ QMediaMetaData::Mood, 0 }, + { QMediaMetaData::TrackNumber, GST_TAG_TRACK_NUMBER }, - //{ QtMultimedia::MetaData::CoverArtUrlSmall, 0 }, - //{ QtMultimedia::MetaData::CoverArtUrlLarge, 0 }, + //{ QMediaMetaData::CoverArtUrlSmall, 0 }, + //{ QMediaMetaData::CoverArtUrlLarge, 0 }, // Image/Video - { QtMultimedia::MetaData::Resolution, "resolution" }, - { QtMultimedia::MetaData::PixelAspectRatio, "pixel-aspect-ratio" }, + { QMediaMetaData::Resolution, "resolution" }, + { QMediaMetaData::PixelAspectRatio, "pixel-aspect-ratio" }, // Video - //{ QtMultimedia::MetaData::VideoFrameRate, 0 }, - //{ QtMultimedia::MetaData::VideoBitRate, 0 }, - { QtMultimedia::MetaData::VideoCodec, GST_TAG_VIDEO_CODEC }, + //{ QMediaMetaData::VideoFrameRate, 0 }, + //{ QMediaMetaData::VideoBitRate, 0 }, + { QMediaMetaData::VideoCodec, GST_TAG_VIDEO_CODEC }, - //{ QtMultimedia::MetaData::PosterUrl, 0 }, + //{ QMediaMetaData::PosterUrl, 0 }, // Movie - //{ QtMultimedia::MetaData::ChapterNumber, 0 }, - //{ QtMultimedia::MetaData::Director, 0 }, - { QtMultimedia::MetaData::LeadPerformer, GST_TAG_PERFORMER }, - //{ QtMultimedia::MetaData::Writer, 0 }, + //{ QMediaMetaData::ChapterNumber, 0 }, + //{ QMediaMetaData::Director, 0 }, + { QMediaMetaData::LeadPerformer, GST_TAG_PERFORMER }, + //{ QMediaMetaData::Writer, 0 }, // Photos - //{ QtMultimedia::MetaData::CameraManufacturer, 0 }, - //{ QtMultimedia::MetaData::CameraModel, 0 }, - //{ QtMultimedia::MetaData::Event, 0 }, - //{ QtMultimedia::MetaData::Subject, 0 } + //{ QMediaMetaData::CameraManufacturer, 0 }, + //{ QMediaMetaData::CameraModel, 0 }, + //{ QMediaMetaData::Event, 0 }, + //{ QMediaMetaData::Subject, 0 } }; QGstreamerMetaDataProvider::QGstreamerMetaDataProvider(QGstreamerPlayerSession *session, QObject *parent) diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h index 84c530057..e53944505 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h @@ -48,7 +48,6 @@ #include <qmediaservice.h> QT_BEGIN_NAMESPACE -class QMediaMetaData; class QMediaPlayerControl; class QMediaPlaylist; class QMediaPlaylistNavigator; diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp index a7e84acb7..081893d73 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp @@ -1313,7 +1313,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::MetaData::Language] = QString::fromUtf8(languageCode); + streamProperties[QMediaMetaData::Language] = QString::fromUtf8(languageCode); //qDebug() << "language for setream" << i << QString::fromUtf8(languageCode); g_free (languageCode); |