diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2011-10-06 14:31:58 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-07 06:16:34 +0200 |
commit | 03f22bcdaf1f80083618856d6e4140d3062f175b (patch) | |
tree | fdfbf0895f4fbd91fb1f4a247cf09e28a1056096 /src/plugins/directshow/player | |
parent | 55bc4f2b46b0099d187db16e049d760cd55626e6 (diff) | |
download | qtmultimedia-03f22bcdaf1f80083618856d6e4140d3062f175b.tar.gz |
Rename QtMultimediaKit to QtMultimedia.
There are a few legacy bits left in place so it passes CI, and
then qt5.git etc can be updated.
Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a
Reviewed-on: http://codereview.qt-project.org/5368
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/plugins/directshow/player')
-rw-r--r-- | src/plugins/directshow/player/directshowmetadatacontrol.cpp | 114 | ||||
-rw-r--r-- | src/plugins/directshow/player/directshowmetadatacontrol.h | 4 |
2 files changed, 59 insertions, 59 deletions
diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp index 7d7b3cef5..3bf2a32a3 100644 --- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp +++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp @@ -54,76 +54,76 @@ namespace { struct QWMMetaDataKeyLookup { - QtMultimediaKit::MetaData key; + QtMultimedia::MetaData key; const wchar_t *token; }; } static const QWMMetaDataKeyLookup qt_wmMetaDataKeys[] = { - { QtMultimediaKit::Title, L"Title" }, - { QtMultimediaKit::SubTitle, L"WM/SubTitle" }, - { QtMultimediaKit::Author, L"Author" }, - { QtMultimediaKit::Comment, L"Comment" }, - { QtMultimediaKit::Description, L"Description" }, - { QtMultimediaKit::Category, L"WM/Category" }, - { QtMultimediaKit::Genre, L"WM/Genre" }, - //{ QtMultimediaKit::Date, 0 }, - { QtMultimediaKit::Year, L"WM/Year" }, - { QtMultimediaKit::UserRating, L"UserRating" }, - //{ QtMultimediaKit::MetaDatawords, 0 }, - { QtMultimediaKit::Language, L"Language" }, - { QtMultimediaKit::Publisher, L"WM/Publisher" }, - { QtMultimediaKit::Copyright, L"Copyright" }, - { QtMultimediaKit::ParentalRating, L"ParentalRating" }, - { QtMultimediaKit::RatingOrganisation, L"RatingOrganisation" }, + { QtMultimedia::Title, L"Title" }, + { QtMultimedia::SubTitle, L"WM/SubTitle" }, + { QtMultimedia::Author, L"Author" }, + { QtMultimedia::Comment, L"Comment" }, + { QtMultimedia::Description, L"Description" }, + { QtMultimedia::Category, L"WM/Category" }, + { QtMultimedia::Genre, L"WM/Genre" }, + //{ QtMultimedia::Date, 0 }, + { QtMultimedia::Year, L"WM/Year" }, + { QtMultimedia::UserRating, L"UserRating" }, + //{ QtMultimedia::MetaDatawords, 0 }, + { QtMultimedia::Language, L"Language" }, + { QtMultimedia::Publisher, L"WM/Publisher" }, + { QtMultimedia::Copyright, L"Copyright" }, + { QtMultimedia::ParentalRating, L"ParentalRating" }, + { QtMultimedia::RatingOrganisation, L"RatingOrganisation" }, // Media - { QtMultimediaKit::Size, L"FileSize" }, - { QtMultimediaKit::MediaType, L"MediaType" }, - { QtMultimediaKit::Duration, L"Duration" }, + { QtMultimedia::Size, L"FileSize" }, + { QtMultimedia::MediaType, L"MediaType" }, + { QtMultimedia::Duration, L"Duration" }, // Audio - { QtMultimediaKit::AudioBitRate, L"AudioBitRate" }, - { QtMultimediaKit::AudioCodec, L"AudioCodec" }, - { QtMultimediaKit::ChannelCount, L"ChannelCount" }, - { QtMultimediaKit::SampleRate, L"Frequency" }, + { QtMultimedia::AudioBitRate, L"AudioBitRate" }, + { QtMultimedia::AudioCodec, L"AudioCodec" }, + { QtMultimedia::ChannelCount, L"ChannelCount" }, + { QtMultimedia::SampleRate, L"Frequency" }, // Music - { QtMultimediaKit::AlbumTitle, L"WM/AlbumTitle" }, - { QtMultimediaKit::AlbumArtist, L"WM/AlbumArtist" }, - { QtMultimediaKit::ContributingArtist, L"Author" }, - { QtMultimediaKit::Composer, L"WM/Composer" }, - { QtMultimediaKit::Conductor, L"WM/Conductor" }, - { QtMultimediaKit::Lyrics, L"WM/Lyrics" }, - { QtMultimediaKit::Mood, L"WM/Mood" }, - { QtMultimediaKit::TrackNumber, L"WM/TrackNumber" }, - //{ QtMultimediaKit::TrackCount, 0 }, - //{ QtMultimediaKit::CoverArtUriSmall, 0 }, - //{ QtMultimediaKit::CoverArtUriLarge, 0 }, + { QtMultimedia::AlbumTitle, L"WM/AlbumTitle" }, + { QtMultimedia::AlbumArtist, L"WM/AlbumArtist" }, + { QtMultimedia::ContributingArtist, L"Author" }, + { QtMultimedia::Composer, L"WM/Composer" }, + { QtMultimedia::Conductor, L"WM/Conductor" }, + { QtMultimedia::Lyrics, L"WM/Lyrics" }, + { QtMultimedia::Mood, L"WM/Mood" }, + { QtMultimedia::TrackNumber, L"WM/TrackNumber" }, + //{ QtMultimedia::TrackCount, 0 }, + //{ QtMultimedia::CoverArtUriSmall, 0 }, + //{ QtMultimedia::CoverArtUriLarge, 0 }, // Image/Video - //{ QtMultimediaKit::Resolution, 0 }, - //{ QtMultimediaKit::PixelAspectRatio, 0 }, + //{ QtMultimedia::Resolution, 0 }, + //{ QtMultimedia::PixelAspectRatio, 0 }, // Video - //{ QtMultimediaKit::FrameRate, 0 }, - { QtMultimediaKit::VideoBitRate, L"VideoBitRate" }, - { QtMultimediaKit::VideoCodec, L"VideoCodec" }, + //{ QtMultimedia::FrameRate, 0 }, + { QtMultimedia::VideoBitRate, L"VideoBitRate" }, + { QtMultimedia::VideoCodec, L"VideoCodec" }, - //{ QtMultimediaKit::PosterUri, 0 }, + //{ QtMultimedia::PosterUri, 0 }, // Movie - { QtMultimediaKit::ChapterNumber, L"ChapterNumber" }, - { QtMultimediaKit::Director, L"WM/Director" }, - { QtMultimediaKit::LeadPerformer, L"LeadPerformer" }, - { QtMultimediaKit::Writer, L"WM/Writer" }, + { QtMultimedia::ChapterNumber, L"ChapterNumber" }, + { QtMultimedia::Director, L"WM/Director" }, + { QtMultimedia::LeadPerformer, L"LeadPerformer" }, + { QtMultimedia::Writer, L"WM/Writer" }, // Photos - { QtMultimediaKit::CameraManufacturer, L"CameraManufacturer" }, - { QtMultimediaKit::CameraModel, L"CameraModel" }, - { QtMultimediaKit::Event, L"Event" }, - { QtMultimediaKit::Subject, L"Subject" } + { QtMultimedia::CameraManufacturer, L"CameraManufacturer" }, + { QtMultimedia::CameraModel, L"CameraModel" }, + { QtMultimedia::Event, L"Event" }, + { QtMultimedia::Subject, L"Subject" } }; static QVariant getValue(IWMHeaderInfo *header, const wchar_t *key) @@ -249,7 +249,7 @@ bool DirectShowMetaDataControl::isMetaDataAvailable() const #endif } -QVariant DirectShowMetaDataControl::metaData(QtMultimediaKit::MetaData key) const +QVariant DirectShowMetaDataControl::metaData(QtMultimedia::MetaData key) const { QVariant value; @@ -269,19 +269,19 @@ QVariant DirectShowMetaDataControl::metaData(QtMultimediaKit::MetaData key) cons BSTR string = 0; switch (key) { - case QtMultimediaKit::Author: + case QtMultimedia::Author: m_content->get_AuthorName(&string); break; - case QtMultimediaKit::Title: + case QtMultimedia::Title: m_content->get_Title(&string); break; - case QtMultimediaKit::ParentalRating: + case QtMultimedia::ParentalRating: m_content->get_Rating(&string); break; - case QtMultimediaKit::Description: + case QtMultimedia::Description: m_content->get_Description(&string); break; - case QtMultimediaKit::Copyright: + case QtMultimedia::Copyright: m_content->get_Copyright(&string); break; default: @@ -297,9 +297,9 @@ QVariant DirectShowMetaDataControl::metaData(QtMultimediaKit::MetaData key) cons return value; } -QList<QtMultimediaKit::MetaData> DirectShowMetaDataControl::availableMetaData() const +QList<QtMultimedia::MetaData> DirectShowMetaDataControl::availableMetaData() const { - return QList<QtMultimediaKit::MetaData>(); + return QList<QtMultimedia::MetaData>(); } QVariant DirectShowMetaDataControl::extendedMetaData(const QString &) const diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.h b/src/plugins/directshow/player/directshowmetadatacontrol.h index d7b046510..f5c65f12c 100644 --- a/src/plugins/directshow/player/directshowmetadatacontrol.h +++ b/src/plugins/directshow/player/directshowmetadatacontrol.h @@ -67,8 +67,8 @@ public: bool isMetaDataAvailable() const; - QVariant metaData(QtMultimediaKit::MetaData key) const; - QList<QtMultimediaKit::MetaData> availableMetaData() const; + QVariant metaData(QtMultimedia::MetaData key) const; + QList<QtMultimedia::MetaData> availableMetaData() const; QVariant extendedMetaData(const QString &key) const; QStringList availableExtendedMetaData() const; |