From 68a09d3093d14c77bc87995404c80ae4ae1e4d08 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Mon, 10 Aug 2015 16:40:38 +0200 Subject: Fix documentation for QML metaData property. For Audio, Video, MediaPlayer and Camera types. Group the sub properties as a \qmlproperty group, which makes the doc much clearer. Change-Id: Id990d7b14a4c3f86768c6b3b4990845f84839944 Reviewed-by: Venugopal Shivashankar --- src/imports/multimedia/Video.qml | 547 +------------------- src/imports/multimedia/qdeclarativeaudio.cpp | 707 ++++---------------------- src/imports/multimedia/qdeclarativecamera.cpp | 116 +---- 3 files changed, 139 insertions(+), 1231 deletions(-) diff --git a/src/imports/multimedia/Video.qml b/src/imports/multimedia/Video.qml index 84abeb08f..2312924d9 100644 --- a/src/imports/multimedia/Video.qml +++ b/src/imports/multimedia/Video.qml @@ -236,7 +236,15 @@ Item { */ property alias hasVideo: player.hasVideo - /* documented below due to length of metaData documentation */ + /*! + \qmlproperty object Video::metaData + + This property holds the meta data for the current media. + + See \l{MediaPlayer::metaData}{MediaPlayer.metaData} for details about each meta data key. + + \sa {QMediaMetaData} + */ property alias metaData: player.metaData /*! @@ -400,540 +408,3 @@ Item { } } - -// *************************************** -// Documentation for meta-data properties. -// *************************************** - -/*! - \qmlproperty variant Video::metaData - - This property holds a collection of all the meta-data for the media. - - You can access individual properties like \l {Video::metaData.title}{metaData.title} - or \l {Video::metaData.trackNumber} {metaData.trackNumber}. -*/ - -/*! - \qmlproperty variant Video::metaData.title - - This property holds the title of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.subTitle - - This property holds the sub-title of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.author - - This property holds the author of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.comment - - This property holds a user comment about the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.description - - This property holds a description of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.category - - This property holds the category of the media - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.genre - - This property holds the genre of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.year - - This property holds the year of release of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.date - - This property holds the date of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.userRating - - This property holds a user rating of the media in the range of 0 to 100. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.keywords - - This property holds a list of keywords describing the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.language - - This property holds the language of the media, as an ISO 639-2 code. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.publisher - - This property holds the publisher of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.copyright - - This property holds the media's copyright notice. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.parentalRating - - This property holds the parental rating of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.ratingOrganization - - This property holds the name of the rating organization responsible for the - parental rating of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.size - - This property property holds the size of the media in bytes. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.mediaType - - This property holds the type of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.audioBitRate - - This property holds the bit rate of the media's audio stream in bits per - second. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.audioCodec - - This property holds the encoding of the media audio stream. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.averageLevel - - This property holds the average volume level of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.channelCount - - This property holds the number of channels in the media's audio stream. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.peakValue - - This property holds the peak volume of the media's audio stream. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.sampleRate - - This property holds the sample rate of the media's audio stream in Hertz. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.albumTitle - - This property holds the title of the album the media belongs to. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.albumArtist - - This property holds the name of the principal artist of the album the media - belongs to. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.contributingArtist - - This property holds the names of artists contributing to the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.composer - - This property holds the composer of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.conductor - - This property holds the conductor of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.lyrics - - This property holds the lyrics to the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.mood - - This property holds the mood of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.trackNumber - - This property holds the track number of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.trackCount - - This property holds the number of track on the album containing the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.coverArtUrlSmall - - This property holds the URL of a small cover art image. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.coverArtUrlLarge - - This property holds the URL of a large cover art image. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.resolution - - This property holds the dimension of an image or video. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.pixelAspectRatio - - This property holds the pixel aspect ratio of an image or video. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.videoFrameRate - - This property holds the frame rate of the media's video stream. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.videoBitRate - - This property holds the bit rate of the media's video stream in bits per - second. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.videoCodec - - This property holds the encoding of the media's video stream. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.posterUrl - - This property holds the URL of a poster image. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.chapterNumber - - This property holds the chapter number of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.director - - This property holds the director of the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.leadPerformer - - This property holds the lead performer in the media. - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.writer - - This property holds the writer of the media. - - \sa {QMediaMetaData} -*/ - -// The remaining properties are related to photos, and are technically -// available but will certainly never have values. - -/*! - \qmlproperty variant Video::metaData.cameraManufacturer - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.cameraModel - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.event - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.subject - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.orientation - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.exposureTime - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.fNumber - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.exposureProgram - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.isoSpeedRatings - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.exposureBiasValue - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.dateTimeDigitized - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.subjectDistance - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.meteringMode - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.lightSource - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.flash - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.focalLength - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.exposureMode - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.whiteBalance - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.DigitalZoomRatio - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.focalLengthIn35mmFilm - - \sa {QMediaMetaData::FocalLengthIn35mmFile} -*/ - -/*! - \qmlproperty variant Video::metaData.sceneCaptureType - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.gainControl - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.contrast - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.saturation - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.sharpness - - \sa {QMediaMetaData} -*/ - -/*! - \qmlproperty variant Video::metaData.deviceSettingDescription - - \sa {QMediaMetaData} -*/ - diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index e724dfbc6..54659071a 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -784,353 +784,109 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! + \qmlpropertygroup QtMultimedia::Audio::metaData + \qmlproperty variant QtMultimedia::Audio::metaData.title + \qmlproperty variant QtMultimedia::Audio::metaData.subTitle \qmlproperty variant QtMultimedia::Audio::metaData.author - - This property holds the author of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.comment - - This property holds a user comment about the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.description - - This property holds a description of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.category - - This property holds the category of the media - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.genre - - This property holds the genre of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.year - - This property holds the year of release of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.date - - This property holds the date of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.userRating - - This property holds a user rating of the media in the range of 0 to 100. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.keywords - - This property holds a list of keywords describing the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.language - - This property holds the language of the media, as an ISO 639-2 code. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.publisher - - This property holds the publisher of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.copyright - - This property holds the media's copyright notice. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.parentalRating - - This property holds the parental rating of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.ratingOrganization - - This property holds the name of the rating organization responsible for the - parental rating of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.size - - This property property holds the size of the media in bytes. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.mediaType - - This property holds the type of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.audioBitRate - - This property holds the bit rate of the media's audio stream in bits per - second. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.audioCodec - - This property holds the encoding of the media audio stream. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.averageLevel - - This property holds the average volume level of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.channelCount - - This property holds the number of channels in the media's audio stream. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.peakValue - - This property holds the peak volume of media's audio stream. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.sampleRate - - This property holds the sample rate of the media's audio stream in hertz. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.albumTitle - - This property holds the title of the album the media belongs to. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.albumArtist - - This property holds the name of the principal artist of the album the media - belongs to. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.contributingArtist - - This property holds the names of artists contributing to the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.composer - - This property holds the composer of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.conductor - - This property holds the conductor of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.lyrics - - This property holds the lyrics to the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.mood - - This property holds the mood of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.trackNumber - - This property holds the track number of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.trackCount - - This property holds the number of tracks on the album containing the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.coverArtUrlSmall - - This property holds the URL of a small cover art image. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.coverArtUrlLarge - - This property holds the URL of a large cover art image. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.resolution - - This property holds the dimension of an image or video. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.pixelAspectRatio - - This property holds the pixel aspect ratio of an image or video. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.videoFrameRate - - This property holds the frame rate of the media's video stream. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.videoBitRate - - This property holds the bit rate of the media's video stream in bits per - second. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.videoCodec - - This property holds the encoding of the media's video stream. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.posterUrl - - This property holds the URL of a poster image. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.chapterNumber - - This property holds the chapter number of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.director - - This property holds the director of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.leadPerformer - - This property holds the lead performer in the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::Audio::metaData.writer - This property holds the writer of the media. + These properties hold the meta data for the current media. + + \list + \li \c metaData.title - the title of the media. + \li \c metaData.subTitle - the sub-title of the media. + \li \c metaData.author - the author of the media. + \li \c metaData.comment - a user comment about the media. + \li \c metaData.description - a description of the media. + \li \c metaData.category - the category of the media. + \li \c metaData.genre - the genre of the media. + \li \c metaData.year - the year of release of the media. + \li \c metaData.date - the date of the media. + \li \c metaData.userRating - a user rating of the media in the range of 0 to 100. + \li \c metaData.keywords - a list of keywords describing the media. + \li \c metaData.language - the language of the media, as an ISO 639-2 code. + \li \c metaData.publisher - the publisher of the media. + \li \c metaData.copyright - the media's copyright notice. + \li \c metaData.parentalRating - the parental rating of the media. + \li \c metaData.ratingOrganization - the name of the rating organization responsible for the + parental rating of the media. + \li \c metaData.size - the size of the media in bytes. + \li \c metaData.mediaType - the type of the media. + \li \c metaData.audioBitRate - the bit rate of the media's audio stream in bits per second. + \li \c metaData.audioCodec - the encoding of the media audio stream. + \li \c metaData.averageLevel - the average volume level of the media. + \li \c metaData.channelCount - the number of channels in the media's audio stream. + \li \c metaData.peakValue - the peak volume of media's audio stream. + \li \c metaData.sampleRate - the sample rate of the media's audio stream in hertz. + \li \c metaData.albumTitle - the title of the album the media belongs to. + \li \c metaData.albumArtist - the name of the principal artist of the album the media + belongs to. + \li \c metaData.contributingArtist - the names of artists contributing to the media. + \li \c metaData.composer - the composer of the media. + \li \c metaData.conductor - the conductor of the media. + \li \c metaData.lyrics - the lyrics to the media. + \li \c metaData.mood - the mood of the media. + \li \c metaData.trackNumber - the track number of the media. + \li \c metaData.trackCount - the number of tracks on the album containing the media. + \li \c metaData.coverArtUrlSmall - the URL of a small cover art image. + \li \c metaData.coverArtUrlLarge - the URL of a large cover art image. + \li \c metaData.resolution - the dimension of an image or video. + \li \c metaData.pixelAspectRatio - the pixel aspect ratio of an image or video. + \li \c metaData.videoFrameRate - the frame rate of the media's video stream. + \li \c metaData.videoBitRate - the bit rate of the media's video stream in bits per second. + \li \c metaData.videoCodec - the encoding of the media's video stream. + \li \c metaData.posterUrl - the URL of a poster image. + \li \c metaData.chapterNumber - the chapter number of the media. + \li \c metaData.director - the director of the media. + \li \c metaData.leadPerformer - the lead performer in the media. + \li \c metaData.writer - the writer of the media. + \endlist \sa {QMediaMetaData} */ + ///////////// MediaPlayer Docs ///////////// /*! @@ -1471,349 +1227,104 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! + \qmlpropertygroup QtMultimedia::MediaPlayer::metaData + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.title + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.subTitle \qmlproperty variant QtMultimedia::MediaPlayer::metaData.author - - This property holds the author of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.comment - - This property holds a user comment about the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.description - - This property holds a description of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.category - - This property holds the category of the media - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.genre - - This property holds the genre of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.year - - This property holds the year of release of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.date - - This property holds the date of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.userRating - - This property holds a user rating of the media in the range of 0 to 100. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.keywords - - This property holds a list of keywords describing the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.language - - This property holds the language of the media, as an ISO 639-2 code. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.publisher - - This property holds the publisher of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.copyright - - This property holds the media's copyright notice. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.parentalRating - - This property holds the parental rating of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.ratingOrganization - - This property holds the name of the rating organization responsible for the - parental rating of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.size - - This property property holds the size of the media in bytes. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.mediaType - - This property holds the type of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.audioBitRate - - This property holds the bit rate of the media's audio stream in bits per - second. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.audioCodec - - This property holds the encoding of the media audio stream. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.averageLevel - - This property holds the average volume level of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.channelCount - - This property holds the number of channels in the media's audio stream. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.peakValue - - This property holds the peak volume of media's audio stream. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.sampleRate - - This property holds the sample rate of the media's audio stream in hertz. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.albumTitle - - This property holds the title of the album the media belongs to. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.albumArtist - - This property holds the name of the principal artist of the album the media - belongs to. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.contributingArtist - - This property holds the names of artists contributing to the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.composer - - This property holds the composer of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.conductor - - This property holds the conductor of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.lyrics - - This property holds the lyrics to the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.mood - - This property holds the mood of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.trackNumber - - This property holds the track number of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.trackCount - - This property holds the number of tracks on the album containing the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.coverArtUrlSmall - - This property holds the URL of a small cover art image. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.coverArtUrlLarge - - This property holds the URL of a large cover art image. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.resolution - - This property holds the dimension of an image or video. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.pixelAspectRatio - - This property holds the pixel aspect ratio of an image or video. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.videoFrameRate - - This property holds the frame rate of the media's video stream. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.videoBitRate - - This property holds the bit rate of the media's video stream in bits per - second. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.videoCodec - - This property holds the encoding of the media's video stream. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.posterUrl - - This property holds the URL of a poster image. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.chapterNumber - - This property holds the chapter number of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.director - - This property holds the director of the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.leadPerformer - - This property holds the lead performer in the media. - - \sa {QMediaMetaData} -*/ - -/*! \qmlproperty variant QtMultimedia::MediaPlayer::metaData.writer - This property holds the writer of the media. + These properties hold the meta data for the current media. + + \list + \li \c metaData.title - the title of the media. + \li \c metaData.subTitle - the sub-title of the media. + \li \c metaData.author - the author of the media. + \li \c metaData.comment - a user comment about the media. + \li \c metaData.description - a description of the media. + \li \c metaData.category - the category of the media. + \li \c metaData.genre - the genre of the media. + \li \c metaData.year - the year of release of the media. + \li \c metaData.date - the date of the media. + \li \c metaData.userRating - a user rating of the media in the range of 0 to 100. + \li \c metaData.keywords - a list of keywords describing the media. + \li \c metaData.language - the language of the media, as an ISO 639-2 code. + \li \c metaData.publisher - the publisher of the media. + \li \c metaData.copyright - the media's copyright notice. + \li \c metaData.parentalRating - the parental rating of the media. + \li \c metaData.ratingOrganization - the name of the rating organization responsible for the + parental rating of the media. + \li \c metaData.size - the size of the media in bytes. + \li \c metaData.mediaType - the type of the media. + \li \c metaData.audioBitRate - the bit rate of the media's audio stream in bits per second. + \li \c metaData.audioCodec - the encoding of the media audio stream. + \li \c metaData.averageLevel - the average volume level of the media. + \li \c metaData.channelCount - the number of channels in the media's audio stream. + \li \c metaData.peakValue - the peak volume of media's audio stream. + \li \c metaData.sampleRate - the sample rate of the media's audio stream in hertz. + \li \c metaData.albumTitle - the title of the album the media belongs to. + \li \c metaData.albumArtist - the name of the principal artist of the album the media + belongs to. + \li \c metaData.contributingArtist - the names of artists contributing to the media. + \li \c metaData.composer - the composer of the media. + \li \c metaData.conductor - the conductor of the media. + \li \c metaData.lyrics - the lyrics to the media. + \li \c metaData.mood - the mood of the media. + \li \c metaData.trackNumber - the track number of the media. + \li \c metaData.trackCount - the number of tracks on the album containing the media. + \li \c metaData.coverArtUrlSmall - the URL of a small cover art image. + \li \c metaData.coverArtUrlLarge - the URL of a large cover art image. + \li \c metaData.resolution - the dimension of an image or video. + \li \c metaData.pixelAspectRatio - the pixel aspect ratio of an image or video. + \li \c metaData.videoFrameRate - the frame rate of the media's video stream. + \li \c metaData.videoBitRate - the bit rate of the media's video stream in bits per second. + \li \c metaData.videoCodec - the encoding of the media's video stream. + \li \c metaData.posterUrl - the URL of a poster image. + \li \c metaData.chapterNumber - the chapter number of the media. + \li \c metaData.director - the director of the media. + \li \c metaData.leadPerformer - the lead performer in the media. + \li \c metaData.writer - the writer of the media. + \endlist \sa {QMediaMetaData} */ diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 3f67a8e94..c2bc28f0e 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -871,116 +871,42 @@ void QDeclarativeCamera::setDigitalZoom(qreal value) */ /*! + \qmlpropertygroup QtMultimedia::Camera::metaData \qmlproperty variant QtMultimedia::Camera::metaData.cameraManufacturer - - This property holds the name of the manufacturer of the camera. - - \sa {QMediaMetaData} - \since 5.4 -*/ - -/*! \qmlproperty variant QtMultimedia::Camera::metaData.cameraModel - - This property holds the name of the model of the camera. - - \sa {QMediaMetaData} - \since 5.4 -*/ - -/*! \qmlproperty variant QtMultimedia::Camera::metaData.event - - This property holds the event during which the photo or video is to be captured. - - \sa {QMediaMetaData} - \since 5.4 -*/ - -/*! \qmlproperty variant QtMultimedia::Camera::metaData.subject - - This property holds the name of the subject of the capture or recording. - - \sa {QMediaMetaData} - \since 5.4 -*/ - -/*! \qmlproperty variant QtMultimedia::Camera::metaData.orientation - - This property holds the clockwise rotation of the camera at time of capture. - - \sa {QMediaMetaData} - \since 5.4 -*/ - -/*! \qmlproperty variant QtMultimedia::Camera::metaData.dateTimeOriginal - - This property holds the initial time at which the photo or video is - captured. - - \sa {QMediaMetaData} - \since 5.4 -*/ - -/*! \qmlproperty variant QtMultimedia::Camera::metaData.gpsLatitude \qmlproperty variant QtMultimedia::Camera::metaData.gpsLongitude \qmlproperty variant QtMultimedia::Camera::metaData.gpsAltitude - - These properties hold the geographic position in decimal degrees of the - camera at time of capture. - - \sa {QMediaMetaData} - \since 5.4 -*/ - -/*! \qmlproperty variant QtMultimedia::Camera::metaData.gpsTimestamp - - This property holds the timestamp of the GPS position data. - - \sa {QMediaMetaData} - \since 5.4 -*/ - -/*! \qmlproperty variant QtMultimedia::Camera::metaData.gpsTrack - - This property holds direction of movement of the camera at the time of - capture. It is measured in degrees clockwise from north. - - \sa {QMediaMetaData} - \since 5.4 -*/ - -/*! \qmlproperty variant QtMultimedia::Camera::metaData.gpsSpeed - - This property holds the velocity in kilometers per hour of the camera at - time of capture. - - \sa {QMediaMetaData} - \since 5.4 -*/ - -/*! \qmlproperty variant QtMultimedia::Camera::metaData.gpsImgDirection - - This property holds direction the camera is facing at the time of capture. - It is measured in degrees clockwise from north. - - \sa {QMediaMetaData} - \since 5.4 -*/ - -/*! \qmlproperty variant QtMultimedia::Camera::metaData.gpsProcessingMethod - This property holds the name of the method for determining the GPS position - data. + These properties hold the meta data for the camera captures. + + \list + \li \c metaData.cameraManufacturer holds the name of the manufacturer of the camera. + \li \c metaData.cameraModel holds the name of the model of the camera. + \li \c metaData.event holds the event during which the photo or video is to be captured. + \li \c metaData.subject holds the name of the subject of the capture or recording. + \li \c metaData.orientation holds the clockwise rotation of the camera at time of capture. + \li \c metaData.dateTimeOriginal holds the initial time at which the photo or video is captured. + \li \c metaData.gpsLatitude holds the latitude of the camera in decimal degrees at time of capture. + \li \c metaData.gpsLongitude holds the longitude of the camera in decimal degrees at time of capture. + \li \c metaData.gpsAltitude holds the altitude of the camera in meters at time of capture. + \li \c metaData.gpsTimestamp holds the timestamp of the GPS position data. + \li \c metaData.gpsTrack holds direction of movement of the camera at the time of + capture. It is measured in degrees clockwise from north. + \li \c metaData.gpsSpeed holds the velocity in kilometers per hour of the camera at time of capture. + \li \c metaData.gpsImgDirection holds direction the camera is facing at the time of capture. + It is measured in degrees clockwise from north. + \li \c metaData.gpsProcessingMethod holds the name of the method for determining the GPS position. + \endlist \sa {QMediaMetaData} \since 5.4 -- cgit v1.2.1