diff options
Diffstat (limited to 'src/plugins')
11 files changed, 236 insertions, 238 deletions
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm b/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm index 84a6bef98..3a7e860e6 100644 --- a/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm +++ b/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm @@ -113,33 +113,33 @@ void AVFMediaPlayerMetaDataControl::updateTags() if (keyString.length != 0) { //Process "commonMetadata" tags here: if ([keyString isEqualToString:AVMetadataCommonKeyTitle]) { - m_tags.insert(QtMultimedia::MetaData::Title, QString([value UTF8String])); + m_tags.insert(QMediaMetaData::Title, QString([value UTF8String])); } else if ([keyString isEqualToString: AVMetadataCommonKeyCreator]) { - m_tags.insert(QtMultimedia::MetaData::Author, QString([value UTF8String])); + m_tags.insert(QMediaMetaData::Author, QString([value UTF8String])); } else if ([keyString isEqualToString: AVMetadataCommonKeySubject]) { - m_tags.insert(QtMultimedia::MetaData::SubTitle, QString([value UTF8String])); + m_tags.insert(QMediaMetaData::SubTitle, QString([value UTF8String])); } else if ([keyString isEqualToString: AVMetadataCommonKeyDescription]) { - m_tags.insert(QtMultimedia::MetaData::Description, QString([value UTF8String])); + m_tags.insert(QMediaMetaData::Description, QString([value UTF8String])); } else if ([keyString isEqualToString: AVMetadataCommonKeyPublisher]) { - m_tags.insert(QtMultimedia::MetaData::Publisher, QString([value UTF8String])); + m_tags.insert(QMediaMetaData::Publisher, QString([value UTF8String])); } else if ([keyString isEqualToString: AVMetadataCommonKeyContributor]) { - m_tags.insert(QtMultimedia::MetaData::ContributingArtist, QString([value UTF8String])); + m_tags.insert(QMediaMetaData::ContributingArtist, QString([value UTF8String])); } else if ([keyString isEqualToString: AVMetadataCommonKeyCreationDate]) { - m_tags.insert(QtMultimedia::MetaData::Date, QString([value UTF8String])); + m_tags.insert(QMediaMetaData::Date, QString([value UTF8String])); } else if ([keyString isEqualToString: AVMetadataCommonKeyType]) { - m_tags.insert(QtMultimedia::MetaData::MediaType, QString([value UTF8String])); + m_tags.insert(QMediaMetaData::MediaType, QString([value UTF8String])); } else if ([keyString isEqualToString: AVMetadataCommonKeyLanguage]) { - m_tags.insert(QtMultimedia::MetaData::Language, QString([value UTF8String])); + m_tags.insert(QMediaMetaData::Language, QString([value UTF8String])); } else if ([keyString isEqualToString: AVMetadataCommonKeyCopyrights]) { - m_tags.insert(QtMultimedia::MetaData::Copyright, QString([value UTF8String])); + m_tags.insert(QMediaMetaData::Copyright, QString([value UTF8String])); } else if ([keyString isEqualToString: AVMetadataCommonKeyAlbumName]) { - m_tags.insert(QtMultimedia::MetaData::AlbumTitle, QString([value UTF8String])); + m_tags.insert(QMediaMetaData::AlbumTitle, QString([value UTF8String])); } else if ([keyString isEqualToString: AVMetadataCommonKeyAuthor]) { - m_tags.insert(QtMultimedia::MetaData::Author, QString([value UTF8String])); + m_tags.insert(QMediaMetaData::Author, QString([value UTF8String])); } else if ([keyString isEqualToString: AVMetadataCommonKeyArtist]) { - m_tags.insert(QtMultimedia::MetaData::AlbumArtist, QString([value UTF8String])); + m_tags.insert(QMediaMetaData::AlbumArtist, QString([value UTF8String])); } else if ([keyString isEqualToString: AVMetadataCommonKeyArtwork]) { - m_tags.insert(QtMultimedia::MetaData::PosterUrl, QString([value UTF8String])); + m_tags.insert(QMediaMetaData::PosterUrl, QString([value UTF8String])); } } diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp index 3b618603c..19da90ea6 100644 --- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp +++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp @@ -61,69 +61,69 @@ namespace static const QWMMetaDataKeyLookup qt_wmMetaDataKeys[] = { - { QtMultimedia::MetaData::Title, L"Title" }, - { QtMultimedia::MetaData::SubTitle, L"WM/SubTitle" }, - { QtMultimedia::MetaData::Author, L"Author" }, - { QtMultimedia::MetaData::Comment, L"Comment" }, - { QtMultimedia::MetaData::Description, L"Description" }, - { QtMultimedia::MetaData::Category, L"WM/Category" }, - { QtMultimedia::MetaData::Genre, L"WM/Genre" }, - //{ QtMultimedia::MetaData::Date, 0 }, - { QtMultimedia::MetaData::Year, L"WM/Year" }, - { QtMultimedia::MetaData::UserRating, L"UserRating" }, - //{ QtMultimedia::MetaData::MetaDatawords, 0 }, - { QtMultimedia::MetaData::Language, L"Language" }, - { QtMultimedia::MetaData::Publisher, L"WM/Publisher" }, - { QtMultimedia::MetaData::Copyright, L"Copyright" }, - { QtMultimedia::MetaData::ParentalRating, L"ParentalRating" }, - //{ QtMultimedia::MetaData::RatingOrganisation, L"RatingOrganisation" }, + { QMediaMetaData::Title, L"Title" }, + { QMediaMetaData::SubTitle, L"WM/SubTitle" }, + { QMediaMetaData::Author, L"Author" }, + { QMediaMetaData::Comment, L"Comment" }, + { QMediaMetaData::Description, L"Description" }, + { QMediaMetaData::Category, L"WM/Category" }, + { QMediaMetaData::Genre, L"WM/Genre" }, + //{ QMediaMetaData::Date, 0 }, + { QMediaMetaData::Year, L"WM/Year" }, + { QMediaMetaData::UserRating, L"UserRating" }, + //{ QMediaMetaData::MetaDatawords, 0 }, + { QMediaMetaData::Language, L"Language" }, + { QMediaMetaData::Publisher, L"WM/Publisher" }, + { QMediaMetaData::Copyright, L"Copyright" }, + { QMediaMetaData::ParentalRating, L"ParentalRating" }, + //{ QMediaMetaData::RatingOrganisation, L"RatingOrganisation" }, // Media - { QtMultimedia::MetaData::Size, L"FileSize" }, - { QtMultimedia::MetaData::MediaType, L"MediaType" }, - { QtMultimedia::MetaData::Duration, L"Duration" }, + { QMediaMetaData::Size, L"FileSize" }, + { QMediaMetaData::MediaType, L"MediaType" }, + { QMediaMetaData::Duration, L"Duration" }, // Audio - { QtMultimedia::MetaData::AudioBitRate, L"AudioBitRate" }, - { QtMultimedia::MetaData::AudioCodec, L"AudioCodec" }, - { QtMultimedia::MetaData::ChannelCount, L"ChannelCount" }, - { QtMultimedia::MetaData::SampleRate, L"Frequency" }, + { QMediaMetaData::AudioBitRate, L"AudioBitRate" }, + { QMediaMetaData::AudioCodec, L"AudioCodec" }, + { QMediaMetaData::ChannelCount, L"ChannelCount" }, + { QMediaMetaData::SampleRate, L"Frequency" }, // Music - { QtMultimedia::MetaData::AlbumTitle, L"WM/AlbumTitle" }, - { QtMultimedia::MetaData::AlbumArtist, L"WM/AlbumArtist" }, - { QtMultimedia::MetaData::ContributingArtist, L"Author" }, - { QtMultimedia::MetaData::Composer, L"WM/Composer" }, - { QtMultimedia::MetaData::Conductor, L"WM/Conductor" }, - { QtMultimedia::MetaData::Lyrics, L"WM/Lyrics" }, - { QtMultimedia::MetaData::Mood, L"WM/Mood" }, - { QtMultimedia::MetaData::TrackNumber, L"WM/TrackNumber" }, - //{ QtMultimedia::MetaData::TrackCount, 0 }, - //{ QtMultimedia::MetaData::CoverArtUriSmall, 0 }, - //{ QtMultimedia::MetaData::CoverArtUriLarge, 0 }, + { QMediaMetaData::AlbumTitle, L"WM/AlbumTitle" }, + { QMediaMetaData::AlbumArtist, L"WM/AlbumArtist" }, + { QMediaMetaData::ContributingArtist, L"Author" }, + { QMediaMetaData::Composer, L"WM/Composer" }, + { QMediaMetaData::Conductor, L"WM/Conductor" }, + { QMediaMetaData::Lyrics, L"WM/Lyrics" }, + { QMediaMetaData::Mood, L"WM/Mood" }, + { QMediaMetaData::TrackNumber, L"WM/TrackNumber" }, + //{ QMediaMetaData::TrackCount, 0 }, + //{ QMediaMetaData::CoverArtUriSmall, 0 }, + //{ QMediaMetaData::CoverArtUriLarge, 0 }, // Image/Video - //{ QtMultimedia::MetaData::Resolution, 0 }, - //{ QtMultimedia::MetaData::PixelAspectRatio, 0 }, + //{ QMediaMetaData::Resolution, 0 }, + //{ QMediaMetaData::PixelAspectRatio, 0 }, // Video - //{ QtMultimedia::MetaData::FrameRate, 0 }, - { QtMultimedia::MetaData::VideoBitRate, L"VideoBitRate" }, - { QtMultimedia::MetaData::VideoCodec, L"VideoCodec" }, + //{ QMediaMetaData::FrameRate, 0 }, + { QMediaMetaData::VideoBitRate, L"VideoBitRate" }, + { QMediaMetaData::VideoCodec, L"VideoCodec" }, - //{ QtMultimedia::MetaData::PosterUri, 0 }, + //{ QMediaMetaData::PosterUri, 0 }, // Movie - { QtMultimedia::MetaData::ChapterNumber, L"ChapterNumber" }, - { QtMultimedia::MetaData::Director, L"WM/Director" }, - { QtMultimedia::MetaData::LeadPerformer, L"LeadPerformer" }, - { QtMultimedia::MetaData::Writer, L"WM/Writer" }, + { QMediaMetaData::ChapterNumber, L"ChapterNumber" }, + { QMediaMetaData::Director, L"WM/Director" }, + { QMediaMetaData::LeadPerformer, L"LeadPerformer" }, + { QMediaMetaData::Writer, L"WM/Writer" }, // Photos - { QtMultimedia::MetaData::CameraManufacturer, L"CameraManufacturer" }, - { QtMultimedia::MetaData::CameraModel, L"CameraModel" }, - { QtMultimedia::MetaData::Event, L"Event" }, - { QtMultimedia::MetaData::Subject, L"Subject" } + { QMediaMetaData::CameraManufacturer, L"CameraManufacturer" }, + { QMediaMetaData::CameraModel, L"CameraModel" }, + { QMediaMetaData::Event, L"Event" }, + { QMediaMetaData::Subject, L"Subject" } }; static QVariant getValue(IWMHeaderInfo *header, const wchar_t *key) @@ -268,15 +268,15 @@ QVariant DirectShowMetaDataControl::metaData(const QString &key) const #endif BSTR string = 0; - if (key == QtMultimedia::MetaData::Author) + if (key == QMediaMetaData::Author) m_content->get_AuthorName(&string); - else if (key == QtMultimedia::MetaData::Title) + else if (key == QMediaMetaData::Title) m_content->get_Title(&string); - else if (key == QtMultimedia::MetaData::ParentalRating) + else if (key == QMediaMetaData::ParentalRating) m_content->get_Rating(&string); - else if (key == QtMultimedia::MetaData::Description) + else if (key == QMediaMetaData::Description) m_content->get_Description(&string); - else if (key == QtMultimedia::MetaData::Copyright) + else if (key == QMediaMetaData::Copyright) m_content->get_Copyright(&string); if (string) { diff --git a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp index 6e6f5036f..1d4c20914 100644 --- a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp @@ -126,16 +126,16 @@ gboolean CameraBinImageCapture::metadataEventProbe(GstPad *pad, GstEvent *event, #endif QVariantMap tags; - tags[QtMultimedia::MetaData::ISOSpeedRatings] = extendedTags.value("capturing-iso-speed"); - tags[QtMultimedia::MetaData::DigitalZoomRatio] = extendedTags.value("capturing-digital-zoom-ratio"); - tags[QtMultimedia::MetaData::ExposureTime] = extendedTags.value("capturing-shutter-speed"); - tags[QtMultimedia::MetaData::WhiteBalance] = extendedTags.value("capturing-white-balance"); - tags[QtMultimedia::MetaData::Flash] = extendedTags.value("capturing-flash-fired"); - tags[QtMultimedia::MetaData::FocalLengthIn35mmFilm] = extendedTags.value("capturing-focal-length"); - tags[QtMultimedia::MetaData::MeteringMode] = extendedTags.value("capturing-metering-mode"); - tags[QtMultimedia::MetaData::ExposureMode] = extendedTags.value("capturing-exposure-mode"); - tags[QtMultimedia::MetaData::FNumber] = extendedTags.value("capturing-focal-ratio"); - tags[QtMultimedia::MetaData::ExposureMode] = extendedTags.value("capturing-exposure-mode"); + tags[QMediaMetaData::ISOSpeedRatings] = extendedTags.value("capturing-iso-speed"); + tags[QMediaMetaData::DigitalZoomRatio] = extendedTags.value("capturing-digital-zoom-ratio"); + tags[QMediaMetaData::ExposureTime] = extendedTags.value("capturing-shutter-speed"); + tags[QMediaMetaData::WhiteBalance] = extendedTags.value("capturing-white-balance"); + tags[QMediaMetaData::Flash] = extendedTags.value("capturing-flash-fired"); + tags[QMediaMetaData::FocalLengthIn35mmFilm] = extendedTags.value("capturing-focal-length"); + tags[QMediaMetaData::MeteringMode] = extendedTags.value("capturing-metering-mode"); + tags[QMediaMetaData::ExposureMode] = extendedTags.value("capturing-exposure-mode"); + tags[QMediaMetaData::FNumber] = extendedTags.value("capturing-focal-ratio"); + tags[QMediaMetaData::ExposureMode] = extendedTags.value("capturing-exposure-mode"); QMapIterator<QString, QVariant> i(tags); while (i.hasNext()) { diff --git a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp b/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp index 4b45df845..9e160f940 100644 --- a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp @@ -54,71 +54,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, 0 }, - //{ 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, 0 }, + //{ 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, 0 }, - //{ QtMultimedia::MetaData::PixelAspectRatio, 0 }, + //{ QMediaMetaData::Resolution, 0 }, + //{ QMediaMetaData::PixelAspectRatio, 0 }, // 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 } }; CameraBinMetaData::CameraBinMetaData(QObject *parent) diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp index 44e622a61..3c1e11563 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp @@ -52,71 +52,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, 0 }, - //{ 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, 0 }, + //{ 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, 0 }, - //{ QtMultimedia::MetaData::PixelAspectRatio, 0 }, + //{ QMediaMetaData::Resolution, 0 }, + //{ QMediaMetaData::PixelAspectRatio, 0 }, // 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 } }; QGstreamerCaptureMetaDataControl::QGstreamerCaptureMetaDataControl(QObject *parent) 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); diff --git a/src/plugins/qt7/mediaplayer/qt7playermetadata.mm b/src/plugins/qt7/mediaplayer/qt7playermetadata.mm index 9c14c4542..7217b4395 100644 --- a/src/plugins/qt7/mediaplayer/qt7playermetadata.mm +++ b/src/plugins/qt7/mediaplayer/qt7playermetadata.mm @@ -233,13 +233,13 @@ void QT7PlayerMetaDataControl::updateTags() metaMap.insert(QLatin1String("nam"), QString::fromUtf8([name UTF8String])); #endif // QUICKTIME_C_API_AVAILABLE - m_tags.insert(QtMultimedia::MetaData::AlbumArtist, metaMap.value(QLatin1String("ART"))); - m_tags.insert(QtMultimedia::MetaData::AlbumTitle, metaMap.value(QLatin1String("alb"))); - m_tags.insert(QtMultimedia::MetaData::Title, metaMap.value(QLatin1String("nam"))); - m_tags.insert(QtMultimedia::MetaData::Date, metaMap.value(QLatin1String("day"))); - m_tags.insert(QtMultimedia::MetaData::Genre, metaMap.value(QLatin1String("gnre"))); - m_tags.insert(QtMultimedia::MetaData::TrackNumber, metaMap.value(QLatin1String("trk"))); - m_tags.insert(QtMultimedia::MetaData::Description, metaMap.value(QLatin1String("des"))); + m_tags.insert(QMediaMetaData::AlbumArtist, metaMap.value(QLatin1String("ART"))); + m_tags.insert(QMediaMetaData::AlbumTitle, metaMap.value(QLatin1String("alb"))); + m_tags.insert(QMediaMetaData::Title, metaMap.value(QLatin1String("nam"))); + m_tags.insert(QMediaMetaData::Date, metaMap.value(QLatin1String("day"))); + m_tags.insert(QMediaMetaData::Genre, metaMap.value(QLatin1String("gnre"))); + m_tags.insert(QMediaMetaData::TrackNumber, metaMap.value(QLatin1String("trk"))); + m_tags.insert(QMediaMetaData::Description, metaMap.value(QLatin1String("des"))); } if (!wasEmpty || !m_tags.isEmpty()) diff --git a/src/plugins/qt7/mediaplayer/qt7playerservice.h b/src/plugins/qt7/mediaplayer/qt7playerservice.h index 0c9a0b9f7..ae9cc11bf 100644 --- a/src/plugins/qt7/mediaplayer/qt7playerservice.h +++ b/src/plugins/qt7/mediaplayer/qt7playerservice.h @@ -48,7 +48,6 @@ QT_BEGIN_NAMESPACE -class QMediaMetaData; class QMediaPlayerControl; class QMediaPlaylist; class QMediaPlaylistNavigator; diff --git a/src/plugins/wmf/player/mfmetadatacontrol.cpp b/src/plugins/wmf/player/mfmetadatacontrol.cpp index a3df0dc47..18c6a4204 100644 --- a/src/plugins/wmf/player/mfmetadatacontrol.cpp +++ b/src/plugins/wmf/player/mfmetadatacontrol.cpp @@ -144,15 +144,15 @@ void MFMetaDataControl::updateSource(IMFPresentationDescriptor* sourcePD, IMFMed continue; bool common = true; if (key == PKEY_Author) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::Author); + m_availableMetaDatas.push_back(QMediaMetaData::Author); } else if (key == PKEY_Title) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::Title); + m_availableMetaDatas.push_back(QMediaMetaData::Title); } else if (key == PKEY_ParentalRating) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::ParentalRating); + m_availableMetaDatas.push_back(QMediaMetaData::ParentalRating); } else if (key == PKEY_Comment) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::Description); + m_availableMetaDatas.push_back(QMediaMetaData::Description); } else if (key == PKEY_Copyright) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::Copyright); + m_availableMetaDatas.push_back(QMediaMetaData::Copyright); //TODO: add more common keys } else { common = false; @@ -183,15 +183,15 @@ void MFMetaDataControl::updateSource(IMFPresentationDescriptor* sourcePD, IMFMed qDebug() << "metadata: " << QString::fromUtf16(sName); #endif if (wcscmp(sName, L"Author") == 0) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::Author); + m_availableMetaDatas.push_back(QMediaMetaData::Author); } else if (wcscmp(sName, L"Title") == 0) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::Title); + m_availableMetaDatas.push_back(QMediaMetaData::Title); } else if (wcscmp(sName, L"Rating") == 0) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::ParentalRating); + m_availableMetaDatas.push_back(QMediaMetaData::ParentalRating); } else if (wcscmp(sName, L"Description") == 0) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::Description); + m_availableMetaDatas.push_back(QMediaMetaData::Description); } else if (wcscmp(sName, L"Copyright") == 0) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::Copyright); + m_availableMetaDatas.push_back(QMediaMetaData::Copyright); //TODO: add more common keys } else { m_availableMetaDatas.push_back(QString::fromUtf16(reinterpret_cast<const ushort*>(sName))); |