diff options
Diffstat (limited to 'src/imports/multimedia')
| -rw-r--r-- | src/imports/multimedia/multimedia.cpp | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/multimedia.pro | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativeaudio.cpp | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativemediabase.cpp | 8 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativemediabase_p.h | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativevideo.cpp | 152 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativevideo_p.h | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/qmetadatacontrolmetaobject.cpp | 152 | ||||
| -rw-r--r-- | src/imports/multimedia/qmetadatacontrolmetaobject_p.h | 2 |
9 files changed, 162 insertions, 162 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index a2e74f4..46ceb34 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -41,7 +41,7 @@ #include <QtDeclarative/qdeclarativeextensionplugin.h> #include <QtDeclarative/qdeclarative.h> -#include <QtMultimedia/private/qsoundeffect_p.h> +#include <QtMediaservices/private/qsoundeffect_p.h> #include "qdeclarativevideo_p.h" #include "qdeclarativeaudio_p.h" diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index 92f7ec4..c1933a3 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -2,7 +2,7 @@ TARGET = multimedia TARGETPATH = Qt/multimedia include(../qimportbase.pri) -QT += multimedia declarative +QT += mediaservices declarative HEADERS += \ qdeclarativeaudio_p.h \ diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index 8d2dc61..4e75099 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -41,7 +41,7 @@ #include "qdeclarativeaudio_p.h" -#include <QtMultimedia/qmediaplayercontrol.h> +#include <QtMediaservices/qmediaplayercontrol.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/multimedia/qdeclarativemediabase.cpp b/src/imports/multimedia/qdeclarativemediabase.cpp index bbd5901..5ed602a 100644 --- a/src/imports/multimedia/qdeclarativemediabase.cpp +++ b/src/imports/multimedia/qdeclarativemediabase.cpp @@ -44,10 +44,10 @@ #include <QtCore/qcoreevent.h> #include <QtCore/qurl.h> -#include <QtMultimedia/qmediaplayercontrol.h> -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaserviceprovider.h> -#include <QtMultimedia/qmetadatacontrol.h> +#include <QtMediaservices/qmediaplayercontrol.h> +#include <QtMediaservices/qmediaservice.h> +#include <QtMediaservices/qmediaserviceprovider.h> +#include <QtMediaservices/qmetadatacontrol.h> #include "qmetadatacontrolmetaobject_p.h" diff --git a/src/imports/multimedia/qdeclarativemediabase_p.h b/src/imports/multimedia/qdeclarativemediabase_p.h index 7d262e0..e5115de 100644 --- a/src/imports/multimedia/qdeclarativemediabase_p.h +++ b/src/imports/multimedia/qdeclarativemediabase_p.h @@ -54,7 +54,7 @@ // #include <QtCore/qbasictimer.h> -#include <QtMultimedia/qmediaplayer.h> +#include <QtMediaservices/qmediaplayer.h> QT_BEGIN_HEADER diff --git a/src/imports/multimedia/qdeclarativevideo.cpp b/src/imports/multimedia/qdeclarativevideo.cpp index bf112be..734bd96 100644 --- a/src/imports/multimedia/qdeclarativevideo.cpp +++ b/src/imports/multimedia/qdeclarativevideo.cpp @@ -41,11 +41,11 @@ #include "qdeclarativevideo_p.h" -#include <QtMultimedia/qmediaplayercontrol.h> -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/private/qpaintervideosurface_p.h> -#include <QtMultimedia/qvideooutputcontrol.h> -#include <QtMultimedia/qvideorenderercontrol.h> +#include <QtMediaservices/qmediaplayercontrol.h> +#include <QtMediaservices/qmediaservice.h> +#include <QtMediaservices/private/qpaintervideosurface_p.h> +#include <QtMediaservices/qvideooutputcontrol.h> +#include <QtMediaservices/qvideorenderercontrol.h> QT_BEGIN_NAMESPACE @@ -435,7 +435,7 @@ QT_END_NAMESPACE This property holds the tile of the media. - \sa {QtMultimedia::Title} + \sa {QtMediaservices::Title} */ /*! @@ -443,7 +443,7 @@ QT_END_NAMESPACE This property holds the sub-title of the media. - \sa {QtMultimedia::SubTitle} + \sa {QtMediaservices::SubTitle} */ /*! @@ -451,7 +451,7 @@ QT_END_NAMESPACE This property holds the author of the media. - \sa {QtMultimedia::Author} + \sa {QtMediaservices::Author} */ /*! @@ -459,7 +459,7 @@ QT_END_NAMESPACE This property holds a user comment about the media. - \sa {QtMultimedia::Comment} + \sa {QtMediaservices::Comment} */ /*! @@ -467,7 +467,7 @@ QT_END_NAMESPACE This property holds a description of the media. - \sa {QtMultimedia::Description} + \sa {QtMediaservices::Description} */ /*! @@ -475,7 +475,7 @@ QT_END_NAMESPACE This property holds the category of the media - \sa {QtMultimedia::Category} + \sa {QtMediaservices::Category} */ /*! @@ -483,7 +483,7 @@ QT_END_NAMESPACE This property holds the genre of the media. - \sa {QtMultimedia::Genre} + \sa {QtMediaservices::Genre} */ /*! @@ -491,7 +491,7 @@ QT_END_NAMESPACE This property holds the year of release of the media. - \sa {QtMultimedia::Year} + \sa {QtMediaservices::Year} */ /*! @@ -499,7 +499,7 @@ QT_END_NAMESPACE This property holds the date of the media. - \sa {QtMultimedia::Date} + \sa {QtMediaservices::Date} */ /*! @@ -507,7 +507,7 @@ QT_END_NAMESPACE This property holds a user rating of the media in the range of 0 to 100. - \sa {QtMultimedia::UserRating} + \sa {QtMediaservices::UserRating} */ /*! @@ -515,7 +515,7 @@ QT_END_NAMESPACE This property holds a list of keywords describing the media. - \sa {QtMultimedia::Keywords} + \sa {QtMediaservices::Keywords} */ /*! @@ -523,7 +523,7 @@ QT_END_NAMESPACE This property holds the language of the media, as an ISO 639-2 code. - \sa {QtMultimedia::Language} + \sa {QtMediaservices::Language} */ /*! @@ -531,7 +531,7 @@ QT_END_NAMESPACE This property holds the publisher of the media. - \sa {QtMultimedia::Publisher} + \sa {QtMediaservices::Publisher} */ /*! @@ -539,7 +539,7 @@ QT_END_NAMESPACE This property holds the media's copyright notice. - \sa {QtMultimedia::Copyright} + \sa {QtMediaservices::Copyright} */ /*! @@ -547,7 +547,7 @@ QT_END_NAMESPACE This property holds the parental rating of the media. - \sa {QtMultimedia::ParentalRating} + \sa {QtMediaservices::ParentalRating} */ /*! @@ -556,7 +556,7 @@ QT_END_NAMESPACE This property holds the name of the rating organisation responsible for the parental rating of the media. - \sa {QtMultimedia::RatingOrganisation} + \sa {QtMediaservices::RatingOrganisation} */ /*! @@ -564,7 +564,7 @@ QT_END_NAMESPACE This property property holds the size of the media in bytes. - \sa {QtMultimedia::Size} + \sa {QtMediaservices::Size} */ /*! @@ -572,7 +572,7 @@ QT_END_NAMESPACE This property holds the type of the media. - \sa {QtMultimedia::MediaType} + \sa {QtMediaservices::MediaType} */ /*! @@ -581,7 +581,7 @@ QT_END_NAMESPACE This property holds the bit rate of the media's audio stream ni bits per second. - \sa {QtMultimedia::AudioBitRate} + \sa {QtMediaservices::AudioBitRate} */ /*! @@ -589,7 +589,7 @@ QT_END_NAMESPACE This property holds the encoding of the media audio stream. - \sa {QtMultimedia::AudioCodec} + \sa {QtMediaservices::AudioCodec} */ /*! @@ -597,7 +597,7 @@ QT_END_NAMESPACE This property holds the average volume level of the media. - \sa {QtMultimedia::AverageLevel} + \sa {QtMediaservices::AverageLevel} */ /*! @@ -605,7 +605,7 @@ QT_END_NAMESPACE This property holds the number of channels in the media's audio stream. - \sa {QtMultimedia::ChannelCount} + \sa {QtMediaservices::ChannelCount} */ /*! @@ -613,7 +613,7 @@ QT_END_NAMESPACE This property holds the peak volume of media's audio stream. - \sa {QtMultimedia::PeakValue} + \sa {QtMediaservices::PeakValue} */ /*! @@ -621,7 +621,7 @@ QT_END_NAMESPACE This property holds the sample rate of the media's audio stream in hertz. - \sa {QtMultimedia::SampleRate} + \sa {QtMediaservices::SampleRate} */ /*! @@ -629,7 +629,7 @@ QT_END_NAMESPACE This property holds the title of the album the media belongs to. - \sa {QtMultimedia::AlbumTitle} + \sa {QtMediaservices::AlbumTitle} */ /*! @@ -638,7 +638,7 @@ QT_END_NAMESPACE This property holds the name of the principal artist of the album the media belongs to. - \sa {QtMultimedia::AlbumArtist} + \sa {QtMediaservices::AlbumArtist} */ /*! @@ -646,7 +646,7 @@ QT_END_NAMESPACE This property holds the names of artists contributing to the media. - \sa {QtMultimedia::ContributingArtist} + \sa {QtMediaservices::ContributingArtist} */ /*! @@ -654,7 +654,7 @@ QT_END_NAMESPACE This property holds the composer of the media. - \sa {QtMultimedia::Composer} + \sa {QtMediaservices::Composer} */ /*! @@ -662,7 +662,7 @@ QT_END_NAMESPACE This property holds the conductor of the media. - \sa {QtMultimedia::Conductor} + \sa {QtMediaservices::Conductor} */ /*! @@ -670,7 +670,7 @@ QT_END_NAMESPACE This property holds the lyrics to the media. - \sa {QtMultimedia::Lyrics} + \sa {QtMediaservices::Lyrics} */ /*! @@ -678,7 +678,7 @@ QT_END_NAMESPACE This property holds the mood of the media. - \sa {QtMultimedia::Mood} + \sa {QtMediaservices::Mood} */ /*! @@ -686,7 +686,7 @@ QT_END_NAMESPACE This property holds the track number of the media. - \sa {QtMultimedia::TrackNumber} + \sa {QtMediaservices::TrackNumber} */ /*! @@ -694,7 +694,7 @@ QT_END_NAMESPACE This property holds the number of track on the album containing the media. - \sa {QtMultimedia::TrackNumber} + \sa {QtMediaservices::TrackNumber} */ /*! @@ -702,7 +702,7 @@ QT_END_NAMESPACE This property holds the URL of a small cover art image. - \sa {QtMultimedia::CoverArtUrlSmall} + \sa {QtMediaservices::CoverArtUrlSmall} */ /*! @@ -710,7 +710,7 @@ QT_END_NAMESPACE This property holds the URL of a large cover art image. - \sa {QtMultimedia::CoverArtUrlLarge} + \sa {QtMediaservices::CoverArtUrlLarge} */ /*! @@ -718,7 +718,7 @@ QT_END_NAMESPACE This property holds the dimension of an image or video. - \sa {QtMultimedia::Resolution} + \sa {QtMediaservices::Resolution} */ /*! @@ -726,7 +726,7 @@ QT_END_NAMESPACE This property holds the pixel aspect ratio of an image or video. - \sa {QtMultimedia::PixelAspectRatio} + \sa {QtMediaservices::PixelAspectRatio} */ /*! @@ -734,7 +734,7 @@ QT_END_NAMESPACE This property holds the frame rate of the media's video stream. - \sa {QtMultimedia::VideoFrameRate} + \sa {QtMediaservices::VideoFrameRate} */ /*! @@ -743,7 +743,7 @@ QT_END_NAMESPACE This property holds the bit rate of the media's video stream in bits per second. - \sa {QtMultimedia::VideoBitRate} + \sa {QtMediaservices::VideoBitRate} */ /*! @@ -751,7 +751,7 @@ QT_END_NAMESPACE This property holds the encoding of the media's video stream. - \sa {QtMultimedia::VideoCodec} + \sa {QtMediaservices::VideoCodec} */ /*! @@ -759,7 +759,7 @@ QT_END_NAMESPACE This property holds the URL of a poster image. - \sa {QtMultimedia::PosterUrl} + \sa {QtMediaservices::PosterUrl} */ /*! @@ -767,7 +767,7 @@ QT_END_NAMESPACE This property holds the chapter number of the media. - \sa {QtMultimedia::ChapterNumber} + \sa {QtMediaservices::ChapterNumber} */ /*! @@ -775,7 +775,7 @@ QT_END_NAMESPACE This property holds the director of the media. - \sa {QtMultimedia::Director} + \sa {QtMediaservices::Director} */ /*! @@ -783,7 +783,7 @@ QT_END_NAMESPACE This property holds the lead performer in the media. - \sa {QtMultimedia::LeadPerformer} + \sa {QtMediaservices::LeadPerformer} */ /*! @@ -791,7 +791,7 @@ QT_END_NAMESPACE This property holds the writer of the media. - \sa {QtMultimedia::Writer} + \sa {QtMediaservices::Writer} */ // The remaining properties are related to photos, and are technically @@ -801,157 +801,157 @@ QT_END_NAMESPACE /*! \qmlproperty variant Video::cameraManufacturer - \sa {QtMultimedia::CameraManufacturer} + \sa {QtMediaservices::CameraManufacturer} */ /*! \qmlproperty variant Video::cameraModel - \sa {QtMultimedia::CameraModel} + \sa {QtMediaservices::CameraModel} */ /*! \qmlproperty variant Video::event - \sa {QtMultimedia::Event} + \sa {QtMediaservices::Event} */ /*! \qmlproperty variant Video::subject - \sa {QtMultimedia::Subject} + \sa {QtMediaservices::Subject} */ /*! \qmlproperty variant Video::orientation - \sa {QtMultimedia::Orientation} + \sa {QtMediaservices::Orientation} */ /*! \qmlproperty variant Video::exposureTime - \sa {QtMultimedia::ExposureTime} + \sa {QtMediaservices::ExposureTime} */ /*! \qmlproperty variant Video::fNumber - \sa {QtMultimedia::FNumber} + \sa {QtMediaservices::FNumber} */ /*! \qmlproperty variant Video::exposureProgram - \sa {QtMultimedia::ExposureProgram} + \sa {QtMediaservices::ExposureProgram} */ /*! \qmlproperty variant Video::isoSpeedRatings - \sa {QtMultimedia::ISOSpeedRatings} + \sa {QtMediaservices::ISOSpeedRatings} */ /*! \qmlproperty variant Video::exposureBiasValue - \sa {QtMultimedia::ExposureBiasValue} + \sa {QtMediaservices::ExposureBiasValue} */ /*! \qmlproperty variant Video::dateTimeDigitized - \sa {QtMultimedia::DateTimeDigitized} + \sa {QtMediaservices::DateTimeDigitized} */ /*! \qmlproperty variant Video::subjectDistance - \sa {QtMultimedia::SubjectDistance} + \sa {QtMediaservices::SubjectDistance} */ /*! \qmlproperty variant Video::meteringMode - \sa {QtMultimedia::MeteringMode} + \sa {QtMediaservices::MeteringMode} */ /*! \qmlproperty variant Video::lightSource - \sa {QtMultimedia::LightSource} + \sa {QtMediaservices::LightSource} */ /*! \qmlproperty variant Video::flash - \sa {QtMultimedia::Flash} + \sa {QtMediaservices::Flash} */ /*! \qmlproperty variant Video::focalLength - \sa {QtMultimedia::FocalLength} + \sa {QtMediaservices::FocalLength} */ /*! \qmlproperty variant Video::exposureMode - \sa {QtMultimedia::ExposureMode} + \sa {QtMediaservices::ExposureMode} */ /*! \qmlproperty variant Video::whiteBalance - \sa {QtMultimedia::WhiteBalance} + \sa {QtMediaservices::WhiteBalance} */ /*! \qmlproperty variant Video::DigitalZoomRatio - \sa {QtMultimedia::DigitalZoomRatio} + \sa {QtMediaservices::DigitalZoomRatio} */ /*! \qmlproperty variant Video::focalLengthIn35mmFilm - \sa {QtMultimedia::FocalLengthIn35mmFile} + \sa {QtMediaservices::FocalLengthIn35mmFile} */ /*! \qmlproperty variant Video::sceneCaptureType - \sa {QtMultimedia::SceneCaptureType} + \sa {QtMediaservices::SceneCaptureType} */ /*! \qmlproperty variant Video::gainControl - \sa {QtMultimedia::GainControl} + \sa {QtMediaservices::GainControl} */ /*! \qmlproperty variant Video::contrast - \sa {QtMultimedia::contrast} + \sa {QtMediaservices::contrast} */ /*! \qmlproperty variant Video::saturation - \sa {QtMultimedia::Saturation} + \sa {QtMediaservices::Saturation} */ /*! \qmlproperty variant Video::sharpness - \sa {QtMultimedia::Sharpness} + \sa {QtMediaservices::Sharpness} */ /*! \qmlproperty variant Video::deviceSettingDescription - \sa {QtMultimedia::DeviceSettingDescription} + \sa {QtMediaservices::DeviceSettingDescription} */ #endif diff --git a/src/imports/multimedia/qdeclarativevideo_p.h b/src/imports/multimedia/qdeclarativevideo_p.h index 29e1090..99882ac 100644 --- a/src/imports/multimedia/qdeclarativevideo_p.h +++ b/src/imports/multimedia/qdeclarativevideo_p.h @@ -55,7 +55,7 @@ #include "qdeclarativemediabase_p.h" -#include <QtMultimedia/qgraphicsvideoitem.h> +#include <QtMediaservices/qgraphicsvideoitem.h> #include <QtCore/qbasictimer.h> #include <QtDeclarative/qdeclarativeitem.h> diff --git a/src/imports/multimedia/qmetadatacontrolmetaobject.cpp b/src/imports/multimedia/qmetadatacontrolmetaobject.cpp index e90cbd6..2f45b50 100644 --- a/src/imports/multimedia/qmetadatacontrolmetaobject.cpp +++ b/src/imports/multimedia/qmetadatacontrolmetaobject.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmetadatacontrolmetaobject_p.h" -#include <QtMultimedia/qmetadatacontrol.h> +#include <QtMediaservices/qmetadatacontrol.h> QT_BEGIN_NAMESPACE @@ -106,101 +106,101 @@ namespace { struct MetaDataKey { - QtMultimedia::MetaData key; + QtMediaservices::MetaData key; const char *name; }; const MetaDataKey qt_metaDataKeys[] = { - { 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" }, + { QtMediaservices::Title, "title" }, + { QtMediaservices::SubTitle, "subTitle" }, + { QtMediaservices::Author, "author" }, + { QtMediaservices::Comment, "comment" }, + { QtMediaservices::Description, "description" }, + { QtMediaservices::Category, "category" }, + { QtMediaservices::Genre, "genre" }, + { QtMediaservices::Year, "year" }, + { QtMediaservices::Date, "date" }, + { QtMediaservices::UserRating, "userRating" }, + { QtMediaservices::Keywords, "keywords" }, + { QtMediaservices::Language, "language" }, + { QtMediaservices::Publisher, "publisher" }, + { QtMediaservices::Copyright, "copyright" }, + { QtMediaservices::ParentalRating, "parentalRating" }, + { QtMediaservices::RatingOrganisation, "ratingOrganisation" }, // Media - { QtMultimedia::Size, "size" }, - { QtMultimedia::MediaType, "mediaType" }, -// { QtMultimedia::Duration, "duration" }, + { QtMediaservices::Size, "size" }, + { QtMediaservices::MediaType, "mediaType" }, +// { QtMediaservices::Duration, "duration" }, // Audio - { QtMultimedia::AudioBitRate, "audioBitRate" }, - { QtMultimedia::AudioCodec, "audioCodec" }, - { QtMultimedia::AverageLevel, "averageLevel" }, - { QtMultimedia::ChannelCount, "channelCount" }, - { QtMultimedia::PeakValue, "peakValue" }, - { QtMultimedia::SampleRate, "sampleRate" }, + { QtMediaservices::AudioBitRate, "audioBitRate" }, + { QtMediaservices::AudioCodec, "audioCodec" }, + { QtMediaservices::AverageLevel, "averageLevel" }, + { QtMediaservices::ChannelCount, "channelCount" }, + { QtMediaservices::PeakValue, "peakValue" }, + { QtMediaservices::SampleRate, "sampleRate" }, // Music - { 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" }, + { QtMediaservices::AlbumTitle, "albumTitle" }, + { QtMediaservices::AlbumArtist, "albumArtist" }, + { QtMediaservices::ContributingArtist, "contributingArtist" }, + { QtMediaservices::Composer, "composer" }, + { QtMediaservices::Conductor, "conductor" }, + { QtMediaservices::Lyrics, "lyrics" }, + { QtMediaservices::Mood, "mood" }, + { QtMediaservices::TrackNumber, "trackNumber" }, + { QtMediaservices::TrackCount, "trackCount" }, + + { QtMediaservices::CoverArtUrlSmall, "coverArtUrlSmall" }, + { QtMediaservices::CoverArtUrlLarge, "coverArtUrlLarge" }, // Image/Video - { QtMultimedia::Resolution, "resolution" }, - { QtMultimedia::PixelAspectRatio, "pixelAspectRatio" }, + { QtMediaservices::Resolution, "resolution" }, + { QtMediaservices::PixelAspectRatio, "pixelAspectRatio" }, // Video - { QtMultimedia::VideoFrameRate, "videoFrameRate" }, - { QtMultimedia::VideoBitRate, "videoBitRate" }, - { QtMultimedia::VideoCodec, "videoCodec" }, + { QtMediaservices::VideoFrameRate, "videoFrameRate" }, + { QtMediaservices::VideoBitRate, "videoBitRate" }, + { QtMediaservices::VideoCodec, "videoCodec" }, - { QtMultimedia::PosterUrl, "posterUrl" }, + { QtMediaservices::PosterUrl, "posterUrl" }, // Movie - { QtMultimedia::ChapterNumber, "chapterNumber" }, - { QtMultimedia::Director, "director" }, - { QtMultimedia::LeadPerformer, "leadPerformer" }, - { QtMultimedia::Writer, "writer" }, + { QtMediaservices::ChapterNumber, "chapterNumber" }, + { QtMediaservices::Director, "director" }, + { QtMediaservices::LeadPerformer, "leadPerformer" }, + { QtMediaservices::Writer, "writer" }, // Photos - { 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" } + { QtMediaservices::CameraManufacturer, "cameraManufacturer" }, + { QtMediaservices::CameraModel, "cameraModel" }, + { QtMediaservices::Event, "event" }, + { QtMediaservices::Subject, "subject" }, + { QtMediaservices::Orientation, "orientation" }, + { QtMediaservices::ExposureTime, "exposureTime" }, + { QtMediaservices::FNumber, "fNumber" }, + { QtMediaservices::ExposureProgram, "exposureProgram" }, + { QtMediaservices::ISOSpeedRatings, "isoSpeedRatings" }, + { QtMediaservices::ExposureBiasValue, "exposureBiasValue" }, + { QtMediaservices::DateTimeOriginal, "dateTimeOriginal" }, + { QtMediaservices::DateTimeDigitized, "dateTimeDigitized" }, + { QtMediaservices::SubjectDistance, "subjectDistance" }, + { QtMediaservices::MeteringMode, "meteringMode" }, + { QtMediaservices::LightSource, "lightSource" }, + { QtMediaservices::Flash, "flash" }, + { QtMediaservices::FocalLength, "focalLength" }, + { QtMediaservices::ExposureMode, "exposureMode" }, + { QtMediaservices::WhiteBalance, "whiteBalance" }, + { QtMediaservices::DigitalZoomRatio, "digitalZoomRatio" }, + { QtMediaservices::FocalLengthIn35mmFilm, "focalLengthIn35mmFilm" }, + { QtMediaservices::SceneCaptureType, "sceneCaptureType" }, + { QtMediaservices::GainControl, "gainControl" }, + { QtMediaservices::Contrast, "contrast" }, + { QtMediaservices::Saturation, "saturation" }, + { QtMediaservices::Sharpness, "sharpness" }, + { QtMediaservices::DeviceSettingDescription, "deviceSettingDescription" } }; class QMetaDataControlObject : public QObject diff --git a/src/imports/multimedia/qmetadatacontrolmetaobject_p.h b/src/imports/multimedia/qmetadatacontrolmetaobject_p.h index c381f2d..128eaa4 100644 --- a/src/imports/multimedia/qmetadatacontrolmetaobject_p.h +++ b/src/imports/multimedia/qmetadatacontrolmetaobject_p.h @@ -54,7 +54,7 @@ // #include <QtCore/qmetaobject.h> -#include <QtMultimedia/qtmedianamespace.h> +#include <QtMediaservices/qtmedianamespace.h> #include <QtCore/private/qobject_p.h> |