diff options
18 files changed, 201 insertions, 201 deletions
diff --git a/demos/multimedia/player/player.cpp b/demos/multimedia/player/player.cpp index 38d96d6..64b1f25 100644 --- a/demos/multimedia/player/player.cpp +++ b/demos/multimedia/player/player.cpp @@ -184,14 +184,14 @@ void Player::positionChanged(qint64 progress) void Player::metaDataChanged() { - //qDebug() << "update metadata" << player->metaData(QtMedia::Title).toString(); + //qDebug() << "update metadata" << player->metaData(QtMultimedia::Title).toString(); if (player->isMetaDataAvailable()) { setTrackInfo(QString("%1 - %2") - .arg(player->metaData(QtMedia::AlbumArtist).toString()) - .arg(player->metaData(QtMedia::Title).toString())); + .arg(player->metaData(QtMultimedia::AlbumArtist).toString()) + .arg(player->metaData(QtMultimedia::Title).toString())); if (coverLabel) { - QUrl url = player->metaData(QtMedia::CoverArtUrlLarge).value<QUrl>(); + QUrl url = player->metaData(QtMultimedia::CoverArtUrlLarge).value<QUrl>(); coverLabel->setPixmap(!url.isEmpty() ? QPixmap(url.toString()) diff --git a/src/multimedia/base/qmediaobject.cpp b/src/multimedia/base/qmediaobject.cpp index 34b57c9..b2b8c1b 100644 --- a/src/multimedia/base/qmediaobject.cpp +++ b/src/multimedia/base/qmediaobject.cpp @@ -96,9 +96,9 @@ QMediaObject::~QMediaObject() Returns the service availability error state. */ -QtMedia::AvailabilityError QMediaObject::availabilityError() const +QtMultimedia::AvailabilityError QMediaObject::availabilityError() const { - return QtMedia::ServiceMissingError; + return QtMultimedia::ServiceMissingError; } /*! @@ -305,7 +305,7 @@ bool QMediaObject::isMetaDataWritable() const /*! Returns the value associated with a meta-data \a key. */ -QVariant QMediaObject::metaData(QtMedia::MetaData key) const +QVariant QMediaObject::metaData(QtMultimedia::MetaData key) const { Q_D(const QMediaObject); @@ -317,7 +317,7 @@ QVariant QMediaObject::metaData(QtMedia::MetaData key) const /*! Sets a \a value for a meta-data \a key. */ -void QMediaObject::setMetaData(QtMedia::MetaData key, const QVariant &value) +void QMediaObject::setMetaData(QtMultimedia::MetaData key, const QVariant &value) { Q_D(QMediaObject); @@ -328,13 +328,13 @@ void QMediaObject::setMetaData(QtMedia::MetaData key, const QVariant &value) /*! Returns a list of keys there is meta-data available for. */ -QList<QtMedia::MetaData> QMediaObject::availableMetaData() const +QList<QtMultimedia::MetaData> QMediaObject::availableMetaData() const { Q_D(const QMediaObject); return d->metaDataControl ? d->metaDataControl->availableMetaData() - : QList<QtMedia::MetaData>(); + : QList<QtMultimedia::MetaData>(); } /*! diff --git a/src/multimedia/base/qmediaobject.h b/src/multimedia/base/qmediaobject.h index a6eff1e..d09b1af 100644 --- a/src/multimedia/base/qmediaobject.h +++ b/src/multimedia/base/qmediaobject.h @@ -67,7 +67,7 @@ public: ~QMediaObject(); virtual bool isAvailable() const; - virtual QtMedia::AvailabilityError availabilityError() const; + virtual QtMultimedia::AvailabilityError availabilityError() const; virtual QMediaService* service() const; @@ -80,9 +80,9 @@ public: bool isMetaDataAvailable() const; bool isMetaDataWritable() 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/multimedia/base/qmediaserviceprovider.cpp b/src/multimedia/base/qmediaserviceprovider.cpp index 3b8dd2c..fcf06d3 100644 --- a/src/multimedia/base/qmediaserviceprovider.cpp +++ b/src/multimedia/base/qmediaserviceprovider.cpp @@ -333,9 +333,9 @@ public: } break; case QMediaServiceProviderHint::ContentType: { - QtMedia::SupportEstimate estimate = QtMedia::NotSupported; + QtMultimedia::SupportEstimate estimate = QtMultimedia::NotSupported; foreach (QMediaServiceProviderPlugin *currentPlugin, plugins) { - QtMedia::SupportEstimate currentEstimate = QtMedia::MaybeSupported; + QtMultimedia::SupportEstimate currentEstimate = QtMultimedia::MaybeSupported; QMediaServiceSupportedFormatsInterface *iface = qobject_cast<QMediaServiceSupportedFormatsInterface*>(currentPlugin); @@ -346,7 +346,7 @@ public: estimate = currentEstimate; plugin = currentPlugin; - if (currentEstimate == QtMedia::PreferedService) + if (currentEstimate == QtMultimedia::PreferedService) break; } } @@ -377,7 +377,7 @@ public: } } - QtMedia::SupportEstimate hasSupport(const QByteArray &serviceType, + QtMultimedia::SupportEstimate hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const @@ -385,10 +385,10 @@ public: QList<QObject*> instances = loader()->instances(serviceType); if (instances.isEmpty()) - return QtMedia::NotSupported; + return QtMultimedia::NotSupported; bool allServicesProvideInterface = true; - QtMedia::SupportEstimate supportEstimate = QtMedia::NotSupported; + QtMultimedia::SupportEstimate supportEstimate = QtMultimedia::NotSupported; foreach(QObject *obj, instances) { QMediaServiceSupportedFormatsInterface *iface = @@ -411,12 +411,12 @@ public: } //don't return PreferedService - supportEstimate = qMin(supportEstimate, QtMedia::ProbablySupported); + supportEstimate = qMin(supportEstimate, QtMultimedia::ProbablySupported); //Return NotSupported only if no services are available of serviceType //or all the services returned NotSupported, otherwise return at least MaybeSupported if (!allServicesProvideInterface) - supportEstimate = qMax(QtMedia::MaybeSupported, supportEstimate); + supportEstimate = qMax(QtMultimedia::MaybeSupported, supportEstimate); return supportEstimate; } @@ -515,7 +515,7 @@ Q_GLOBAL_STATIC(QPluginServiceProvider, pluginProvider); service that is able to play media of a specific \a mimeType that is encoded using the listed \a codecs while adhearing to constraints identified in \a flags. */ -QtMedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, +QtMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const @@ -525,7 +525,7 @@ QtMedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &ser Q_UNUSED(codecs); Q_UNUSED(flags); - return QtMedia::MaybeSupported; + return QtMultimedia::MaybeSupported; } /*! diff --git a/src/multimedia/base/qmediaserviceprovider.h b/src/multimedia/base/qmediaserviceprovider.h index f108d32..2ee0ae4 100644 --- a/src/multimedia/base/qmediaserviceprovider.h +++ b/src/multimedia/base/qmediaserviceprovider.h @@ -105,7 +105,7 @@ public: virtual QMediaService* requestService(const QByteArray &type, const QMediaServiceProviderHint &hint = QMediaServiceProviderHint()) = 0; virtual void releaseService(QMediaService *service) = 0; - virtual QtMedia::SupportEstimate hasSupport(const QByteArray &serviceType, + virtual QtMultimedia::SupportEstimate hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags = 0) const; diff --git a/src/multimedia/base/qmediaserviceproviderplugin.h b/src/multimedia/base/qmediaserviceproviderplugin.h index 0381093..b1e728b 100644 --- a/src/multimedia/base/qmediaserviceproviderplugin.h +++ b/src/multimedia/base/qmediaserviceproviderplugin.h @@ -76,7 +76,7 @@ Q_DECLARE_INTERFACE(QMediaServiceProviderFactoryInterface, QMediaServiceProvider struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedFormatsInterface { virtual ~QMediaServiceSupportedFormatsInterface() {} - virtual QtMedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const = 0; + virtual QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const = 0; virtual QStringList supportedMimeTypes() const = 0; }; diff --git a/src/multimedia/base/qmetadatacontrol.h b/src/multimedia/base/qmetadatacontrol.h index 5609f10..8e18c16 100644 --- a/src/multimedia/base/qmetadatacontrol.h +++ b/src/multimedia/base/qmetadatacontrol.h @@ -63,9 +63,9 @@ public: virtual bool isWritable() const = 0; virtual bool isMetaDataAvailable() const = 0; - virtual QVariant metaData(QtMedia::MetaData key) const = 0; - virtual void setMetaData(QtMedia::MetaData key, const QVariant &value) = 0; - virtual QList<QtMedia::MetaData> availableMetaData() const = 0; + virtual QVariant metaData(QtMultimedia::MetaData key) const = 0; + virtual void setMetaData(QtMultimedia::MetaData key, const QVariant &value) = 0; + virtual QList<QtMultimedia::MetaData> availableMetaData() const = 0; virtual QVariant extendedMetaData(const QString &key) const = 0; virtual void setExtendedMetaData(const QString &key, const QVariant &value) = 0; diff --git a/src/multimedia/base/qtmedianamespace.h b/src/multimedia/base/qtmedianamespace.h index c3b4896..2a56fc3 100644 --- a/src/multimedia/base/qtmedianamespace.h +++ b/src/multimedia/base/qtmedianamespace.h @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) -namespace QtMedia +namespace QtMultimedia { enum MetaData { diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 6ce34ab..5f50fdb 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -645,7 +645,7 @@ void QMediaPlayer::unbind(QObject *obj) The \a flags argument allows additional requirements such as performance indicators to be specified. */ -QtMedia::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType, +QtMultimedia::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType, const QStringList& codecs, Flags flags) { diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index 91d6790..1b761ce 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -116,7 +116,7 @@ public: QMediaPlayer(QObject *parent = 0, Flags flags = 0, QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider()); ~QMediaPlayer(); - static QtMedia::SupportEstimate hasSupport(const QString &mimeType, + static QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs = QStringList(), Flags flags = 0); static QStringList supportedMimeTypes(Flags flags = 0); diff --git a/src/multimedia/qml/qmetadatacontrolmetaobject.cpp b/src/multimedia/qml/qmetadatacontrolmetaobject.cpp index 882d8a6..7f9575e 100644 --- a/src/multimedia/qml/qmetadatacontrolmetaobject.cpp +++ b/src/multimedia/qml/qmetadatacontrolmetaobject.cpp @@ -106,101 +106,101 @@ namespace { struct MetaDataKey { - QtMedia::MetaData key; + QtMultimedia::MetaData key; const char *name; }; const MetaDataKey qt_metaDataKeys[] = { - { QtMedia::Title, "title" }, - { QtMedia::SubTitle, "subTitle" }, - { QtMedia::Author, "author" }, - { QtMedia::Comment, "comment" }, - { QtMedia::Description, "description" }, - { QtMedia::Category, "category" }, - { QtMedia::Genre, "genre" }, - { QtMedia::Year, "year" }, - { QtMedia::Date, "date" }, - { QtMedia::UserRating, "userRating" }, - { QtMedia::Keywords, "keywords" }, - { QtMedia::Language, "language" }, - { QtMedia::Publisher, "publisher" }, - { QtMedia::Copyright, "copyright" }, - { QtMedia::ParentalRating, "parentalRating" }, - { QtMedia::RatingOrganisation, "ratingOrganisation" }, + { QtMultimedia::Title, "title" }, + { QtMultimedia::SubTitle, "subTitle" }, + { QtMultimedia::Author, "author" }, + { QtMultimedia::Comment, "comment" }, + { QtMultimedia::Description, "description" }, + { QtMultimedia::Category, "category" }, + { QtMultimedia::Genre, "genre" }, + { QtMultimedia::Year, "year" }, + { QtMultimedia::Date, "date" }, + { QtMultimedia::UserRating, "userRating" }, + { QtMultimedia::Keywords, "keywords" }, + { QtMultimedia::Language, "language" }, + { QtMultimedia::Publisher, "publisher" }, + { QtMultimedia::Copyright, "copyright" }, + { QtMultimedia::ParentalRating, "parentalRating" }, + { QtMultimedia::RatingOrganisation, "ratingOrganisation" }, // Media - { QtMedia::Size, "size" }, - { QtMedia::MediaType, "mediaType" }, + { QtMultimedia::Size, "size" }, + { QtMultimedia::MediaType, "mediaType" }, // { QtMedia::Duration, "duration" }, // Audio - { QtMedia::AudioBitRate, "audioBitRate" }, - { QtMedia::AudioCodec, "audioCodec" }, - { QtMedia::AverageLevel, "averageLevel" }, - { QtMedia::ChannelCount, "channelCount" }, - { QtMedia::PeakValue, "peakValue" }, - { QtMedia::SampleRate, "sampleRate" }, + { QtMultimedia::AudioBitRate, "audioBitRate" }, + { QtMultimedia::AudioCodec, "audioCodec" }, + { QtMultimedia::AverageLevel, "averageLevel" }, + { QtMultimedia::ChannelCount, "channelCount" }, + { QtMultimedia::PeakValue, "peakValue" }, + { QtMultimedia::SampleRate, "sampleRate" }, // Music - { QtMedia::AlbumTitle, "albumTitle" }, - { QtMedia::AlbumArtist, "albumArtist" }, - { QtMedia::ContributingArtist, "contributingArtist" }, - { QtMedia::Composer, "composer" }, - { QtMedia::Conductor, "conductor" }, - { QtMedia::Lyrics, "lyrics" }, - { QtMedia::Mood, "mood" }, - { QtMedia::TrackNumber, "trackNumber" }, - { QtMedia::TrackCount, "trackCount" }, - - { QtMedia::CoverArtUrlSmall, "coverArtUrlSmall" }, - { QtMedia::CoverArtUrlLarge, "coverArtUrlLarge" }, + { QtMultimedia::AlbumTitle, "albumTitle" }, + { QtMultimedia::AlbumArtist, "albumArtist" }, + { QtMultimedia::ContributingArtist, "contributingArtist" }, + { QtMultimedia::Composer, "composer" }, + { QtMultimedia::Conductor, "conductor" }, + { QtMultimedia::Lyrics, "lyrics" }, + { QtMultimedia::Mood, "mood" }, + { QtMultimedia::TrackNumber, "trackNumber" }, + { QtMultimedia::TrackCount, "trackCount" }, + + { QtMultimedia::CoverArtUrlSmall, "coverArtUrlSmall" }, + { QtMultimedia::CoverArtUrlLarge, "coverArtUrlLarge" }, // Image/Video - { QtMedia::Resolution, "resolution" }, - { QtMedia::PixelAspectRatio, "pixelAspectRatio" }, + { QtMultimedia::Resolution, "resolution" }, + { QtMultimedia::PixelAspectRatio, "pixelAspectRatio" }, // Video - { QtMedia::VideoFrameRate, "videoFrameRate" }, - { QtMedia::VideoBitRate, "videoBitRate" }, - { QtMedia::VideoCodec, "videoCodec" }, + { QtMultimedia::VideoFrameRate, "videoFrameRate" }, + { QtMultimedia::VideoBitRate, "videoBitRate" }, + { QtMultimedia::VideoCodec, "videoCodec" }, - { QtMedia::PosterUrl, "posterUrl" }, + { QtMultimedia::PosterUrl, "posterUrl" }, // Movie - { QtMedia::ChapterNumber, "chapterNumber" }, - { QtMedia::Director, "director" }, - { QtMedia::LeadPerformer, "leadPerformer" }, - { QtMedia::Writer, "writer" }, + { QtMultimedia::ChapterNumber, "chapterNumber" }, + { QtMultimedia::Director, "director" }, + { QtMultimedia::LeadPerformer, "leadPerformer" }, + { QtMultimedia::Writer, "writer" }, // Photos - { QtMedia::CameraManufacturer, "cameraManufacturer" }, - { QtMedia::CameraModel, "cameraModel" }, - { QtMedia::Event, "event" }, - { QtMedia::Subject, "subject" }, - { QtMedia::Orientation, "orientation" }, - { QtMedia::ExposureTime, "exposureTime" }, - { QtMedia::FNumber, "fNumber" }, - { QtMedia::ExposureProgram, "exposureProgram" }, - { QtMedia::ISOSpeedRatings, "isoSpeedRatings" }, - { QtMedia::ExposureBiasValue, "exposureBiasValue" }, - { QtMedia::DateTimeOriginal, "dateTimeOriginal" }, - { QtMedia::DateTimeDigitized, "dateTimeDigitized" }, - { QtMedia::SubjectDistance, "subjectDistance" }, - { QtMedia::MeteringMode, "meteringMode" }, - { QtMedia::LightSource, "lightSource" }, - { QtMedia::Flash, "flash" }, - { QtMedia::FocalLength, "focalLength" }, - { QtMedia::ExposureMode, "exposureMode" }, - { QtMedia::WhiteBalance, "whiteBalance" }, - { QtMedia::DigitalZoomRatio, "digitalZoomRatio" }, - { QtMedia::FocalLengthIn35mmFilm, "focalLengthIn35mmFilm" }, - { QtMedia::SceneCaptureType, "sceneCaptureType" }, - { QtMedia::GainControl, "gainControl" }, - { QtMedia::Contrast, "contrast" }, - { QtMedia::Saturation, "saturation" }, - { QtMedia::Sharpness, "sharpness" }, - { QtMedia::DeviceSettingDescription, "deviceSettingDescription" } + { QtMultimedia::CameraManufacturer, "cameraManufacturer" }, + { QtMultimedia::CameraModel, "cameraModel" }, + { QtMultimedia::Event, "event" }, + { QtMultimedia::Subject, "subject" }, + { QtMultimedia::Orientation, "orientation" }, + { QtMultimedia::ExposureTime, "exposureTime" }, + { QtMultimedia::FNumber, "fNumber" }, + { QtMultimedia::ExposureProgram, "exposureProgram" }, + { QtMultimedia::ISOSpeedRatings, "isoSpeedRatings" }, + { QtMultimedia::ExposureBiasValue, "exposureBiasValue" }, + { QtMultimedia::DateTimeOriginal, "dateTimeOriginal" }, + { QtMultimedia::DateTimeDigitized, "dateTimeDigitized" }, + { QtMultimedia::SubjectDistance, "subjectDistance" }, + { QtMultimedia::MeteringMode, "meteringMode" }, + { QtMultimedia::LightSource, "lightSource" }, + { QtMultimedia::Flash, "flash" }, + { QtMultimedia::FocalLength, "focalLength" }, + { QtMultimedia::ExposureMode, "exposureMode" }, + { QtMultimedia::WhiteBalance, "whiteBalance" }, + { QtMultimedia::DigitalZoomRatio, "digitalZoomRatio" }, + { QtMultimedia::FocalLengthIn35mmFilm, "focalLengthIn35mmFilm" }, + { QtMultimedia::SceneCaptureType, "sceneCaptureType" }, + { QtMultimedia::GainControl, "gainControl" }, + { QtMultimedia::Contrast, "contrast" }, + { QtMultimedia::Saturation, "saturation" }, + { QtMultimedia::Sharpness, "sharpness" }, + { QtMultimedia::DeviceSettingDescription, "deviceSettingDescription" } }; class QMetaDataControlObject : public QObject diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp b/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp index e95ddcd..56820d2 100644 --- a/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp +++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.cpp @@ -57,50 +57,50 @@ namespace { struct QWMMetaDataKeyLookup { - QtMedia::MetaData key; + QtMultimedia::MetaData key; const wchar_t *token; }; } static const QWMMetaDataKeyLookup qt_wmMetaDataKeys[] = { - { QtMedia::Title, L"Title" }, - { QtMedia::SubTitle, L"WM/SubTitle" }, - { QtMedia::Author, L"Author" }, - { QtMedia::Comment, L"Comment" }, - { QtMedia::Description, L"Description" }, - { QtMedia::Category, L"WM/Category" }, - { QtMedia::Genre, L"WM/Genre" }, + { 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" }, //{ QtMedia::Date, 0 }, - { QtMedia::Year, L"WM/Year" }, - { QtMedia::UserRating, L"UserRating" }, + { QtMultimedia::Year, L"WM/Year" }, + { QtMultimedia::UserRating, L"UserRating" }, //{ QtMedia::MetaDatawords, 0 }, - { QtMedia::Language, L"Language" }, - { QtMedia::Publisher, L"WM/Publisher" }, - { QtMedia::Copyright, L"Copyright" }, - { QtMedia::ParentalRating, L"ParentalRating" }, - { QtMedia::RatingOrganisation, L"RatingOrganisation" }, + { QtMultimedia::Language, L"Language" }, + { QtMultimedia::Publisher, L"WM/Publisher" }, + { QtMultimedia::Copyright, L"Copyright" }, + { QtMultimedia::ParentalRating, L"ParentalRating" }, + { QtMultimedia::RatingOrganisation, L"RatingOrganisation" }, // Media - { QtMedia::Size, L"FileSize" }, - { QtMedia::MediaType, L"MediaType" }, - { QtMedia::Duration, L"Duration" }, + { QtMultimedia::Size, L"FileSize" }, + { QtMultimedia::MediaType, L"MediaType" }, + { QtMultimedia::Duration, L"Duration" }, // Audio - { QtMedia::AudioBitRate, L"AudioBitRate" }, - { QtMedia::AudioCodec, L"AudioCodec" }, - { QtMedia::ChannelCount, L"ChannelCount" }, - { QtMedia::SampleRate, L"Frequency" }, + { QtMultimedia::AudioBitRate, L"AudioBitRate" }, + { QtMultimedia::AudioCodec, L"AudioCodec" }, + { QtMultimedia::ChannelCount, L"ChannelCount" }, + { QtMultimedia::SampleRate, L"Frequency" }, // Music - { QtMedia::AlbumTitle, L"WM/AlbumTitle" }, - { QtMedia::AlbumArtist, L"WM/AlbumArtist" }, - { QtMedia::ContributingArtist, L"Author" }, - { QtMedia::Composer, L"WM/Composer" }, - { QtMedia::Conductor, L"WM/Conductor" }, - { QtMedia::Lyrics, L"WM/Lyrics" }, - { QtMedia::Mood, L"WM/Mood" }, - { QtMedia::TrackNumber, L"WM/TrackNumber" }, + { 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" }, //{ QtMedia::TrackCount, 0 }, //{ QtMedia::CoverArtUriSmall, 0 }, //{ QtMedia::CoverArtUriLarge, 0 }, @@ -111,22 +111,22 @@ static const QWMMetaDataKeyLookup qt_wmMetaDataKeys[] = // Video //{ QtMedia::FrameRate, 0 }, - { QtMedia::VideoBitRate, L"VideoBitRate" }, - { QtMedia::VideoCodec, L"VideoCodec" }, + { QtMultimedia::VideoBitRate, L"VideoBitRate" }, + { QtMultimedia::VideoCodec, L"VideoCodec" }, //{ QtMedia::PosterUri, 0 }, // Movie - { QtMedia::ChapterNumber, L"ChapterNumber" }, - { QtMedia::Director, L"WM/Director" }, - { QtMedia::LeadPerformer, L"LeadPerformer" }, - { QtMedia::Writer, L"WM/Writer" }, + { QtMultimedia::ChapterNumber, L"ChapterNumber" }, + { QtMultimedia::Director, L"WM/Director" }, + { QtMultimedia::LeadPerformer, L"LeadPerformer" }, + { QtMultimedia::Writer, L"WM/Writer" }, // Photos - { QtMedia::CameraManufacturer, L"CameraManufacturer" }, - { QtMedia::CameraModel, L"CameraModel" }, - { QtMedia::Event, L"Event" }, - { QtMedia::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) @@ -257,7 +257,7 @@ bool DirectShowMetaDataControl::isMetaDataAvailable() const #endif } -QVariant DirectShowMetaDataControl::metaData(QtMedia::MetaData key) const +QVariant DirectShowMetaDataControl::metaData(QtMultimedia::MetaData key) const { QVariant value; @@ -277,19 +277,19 @@ QVariant DirectShowMetaDataControl::metaData(QtMedia::MetaData key) const BSTR string = 0; switch (key) { - case QtMedia::Author: + case QtMultimedia::Author: m_content->get_AuthorName(&string); break; - case QtMedia::Title: + case QtMultimedia::Title: m_content->get_Title(&string); break; - case QtMedia::ParentalRating: + case QtMultimedia::ParentalRating: m_content->get_Rating(&string); break; - case QtMedia::Description: + case QtMultimedia::Description: m_content->get_Description(&string); break; - case QtMedia::Copyright: + case QtMultimedia::Copyright: m_content->get_Copyright(&string); break; default: @@ -305,13 +305,13 @@ QVariant DirectShowMetaDataControl::metaData(QtMedia::MetaData key) const return value; } -void DirectShowMetaDataControl::setMetaData(QtMedia::MetaData, const QVariant &) +void DirectShowMetaDataControl::setMetaData(QtMultimedia::MetaData, const QVariant &) { } -QList<QtMedia::MetaData> DirectShowMetaDataControl::availableMetaData() const +QList<QtMultimedia::MetaData> DirectShowMetaDataControl::availableMetaData() const { - return QList<QtMedia::MetaData>(); + return QList<QtMultimedia::MetaData>(); } QVariant DirectShowMetaDataControl::extendedMetaData(const QString &) const diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.h b/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.h index eb3bbb7..966f9b8 100644 --- a/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.h +++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowmetadatacontrol.h @@ -71,9 +71,9 @@ public: bool isWritable() const; bool isMetaDataAvailable() 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/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; diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h index 9aa9887..f16807a 100644 --- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.h +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.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); @@ -74,7 +74,7 @@ private slots: private: QT7PlayerSession *m_session; - QMap<QtMedia::MetaData, QVariant> m_tags; + QMap<QtMultimedia::MetaData, QVariant> m_tags; }; QT_END_NAMESPACE diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm index 96b7a68..a14981a 100644 --- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm @@ -72,18 +72,18 @@ bool QT7PlayerMetaDataControl::isWritable() const return false; } -QVariant QT7PlayerMetaDataControl::metaData(QtMedia::MetaData key) const +QVariant QT7PlayerMetaDataControl::metaData(QtMultimedia::MetaData key) const { return m_tags.value(key); } -void QT7PlayerMetaDataControl::setMetaData(QtMedia::MetaData key, QVariant const &value) +void QT7PlayerMetaDataControl::setMetaData(QtMultimedia::MetaData key, QVariant const &value) { Q_UNUSED(key); Q_UNUSED(value); } -QList<QtMedia::MetaData> QT7PlayerMetaDataControl::availableMetaData() const +QList<QtMultimedia::MetaData> QT7PlayerMetaDataControl::availableMetaData() const { return m_tags.keys(); } @@ -243,13 +243,13 @@ void QT7PlayerMetaDataControl::updateTags() metaMap.insert(QLatin1String("nam"), QString::fromUtf8([name UTF8String])); #endif // QUICKTIME_C_API_AVAILABLE - m_tags.insert(QtMedia::AlbumArtist, metaMap.value(QLatin1String("ART"))); - m_tags.insert(QtMedia::AlbumTitle, metaMap.value(QLatin1String("alb"))); - m_tags.insert(QtMedia::Title, metaMap.value(QLatin1String("nam"))); - m_tags.insert(QtMedia::Date, metaMap.value(QLatin1String("day"))); - m_tags.insert(QtMedia::Genre, metaMap.value(QLatin1String("gnre"))); - m_tags.insert(QtMedia::TrackNumber, metaMap.value(QLatin1String("trk"))); - m_tags.insert(QtMedia::Description, metaMap.value(QLatin1String("des"))); + m_tags.insert(QtMultimedia::AlbumArtist, metaMap.value(QLatin1String("ART"))); + m_tags.insert(QtMultimedia::AlbumTitle, metaMap.value(QLatin1String("alb"))); + m_tags.insert(QtMultimedia::Title, metaMap.value(QLatin1String("nam"))); + m_tags.insert(QtMultimedia::Date, metaMap.value(QLatin1String("day"))); + m_tags.insert(QtMultimedia::Genre, metaMap.value(QLatin1String("gnre"))); + m_tags.insert(QtMultimedia::TrackNumber, metaMap.value(QLatin1String("trk"))); + m_tags.insert(QtMultimedia::Description, metaMap.value(QLatin1String("des"))); } if (!wasEmpty || !m_tags.isEmpty()) |