slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/5.5' into 5.6

Browse Source 
Conflicts:
	src/imports/multimedia/qdeclarativeaudio.cpp

Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13
This commit is contained in:
Yoann Lopes
2015-08-24 14:31:24 +02:00
parent 31fce88b3f 008d20e0ec
commit a2244c9b7a
56 changed files with 2426 additions and 1986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

550
src/imports/multimedia/Video.qml
View File

@@ -48,9 +48,6 @@ import QtMultimedia 5.6
types.
\qml
import QtQuick 2.0
import QtMultimedia 5.0
Video {
id: video
width : 800
@@ -239,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
/*!
@@ -457,540 +462,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}
*/

774
src/imports/multimedia/qdeclarativeaudio.cpp
View File

@@ -59,12 +59,7 @@ QT_BEGIN_NAMESPACE
\ingroup multimedia_qml
\ingroup multimedia_audio_qml
This type is part of the \b{QtMultimedia 5.0} module.
\qml
import QtQuick 2.0
import QtMultimedia 5.0
Text {
text: "Click Me!";
font.pointSize: 24;
@@ -919,369 +914,124 @@ void QDeclarativeAudio::_q_mediaChanged(const QMediaContent &media)
*/
/*!
\qmlproperty variant QtMultimedia::Audio::mediaObject
This property holds the native media object.
It can be used to get a pointer to a QMediaPlayer object in order to integrate with C++ code.
\code
QObject *qmlAudio; // The QML Audio object
QMediaPlayer *player = qvariant_cast<QMediaPlayer *>(qmlAudio->property("mediaObject"));
\endcode
\note This property is not accessible from QML.
*/
/*!
\qmlpropertygroup QtMultimedia::Audio::metaData
\qmlproperty variant QtMultimedia::Audio::metaData.title
This property holds the title of the media.
\sa {QMediaMetaData}
*/
/*!
\qmlproperty variant QtMultimedia::Audio::metaData.subTitle
This property holds the sub-title of the media.
\sa {QMediaMetaData}
*/
/*!
\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 /////////////
/*!
@@ -1294,12 +1044,7 @@ void QDeclarativeAudio::_q_mediaChanged(const QMediaContent &media)
\ingroup multimedia_audio_qml
\ingroup multimedia_video_qml
MediaPlayer is part of the \b{QtMultimedia 5.0} module.
\qml
import QtQuick 2.0
import QtMultimedia 5.0
Text {
text: "Click Me!";
font.pointSize: 24;
@@ -1321,9 +1066,6 @@ void QDeclarativeAudio::_q_mediaChanged(const QMediaContent &media)
or you can use it in conjunction with a \l VideoOutput for rendering video.
\qml
import QtQuick 2.0
import QtMultimedia 5.0
Item {
MediaPlayer {
id: mediaplayer
@@ -1664,365 +1406,119 @@ void QDeclarativeAudio::_q_mediaChanged(const QMediaContent &media)
*/
/*!
\qmlproperty variant QtMultimedia::MediaPlayer::mediaObject
This property holds the native media object.
It can be used to get a pointer to a QMediaPlayer object in order to integrate with C++ code.
\code
QObject *qmlMediaPlayer; // The QML MediaPlayer object
QMediaPlayer *player = qvariant_cast<QMediaPlayer *>(qmlMediaPlayer->property("mediaObject"));
\endcode
\note This property is not accessible from QML.
*/
/*!
\qmlpropertygroup QtMultimedia::MediaPlayer::metaData
\qmlproperty variant QtMultimedia::MediaPlayer::metaData.title
This property holds the title of the media.
\sa {QMediaMetaData}
*/
/*!
\qmlproperty variant QtMultimedia::MediaPlayer::metaData.subTitle
This property holds the sub-title of the media.
\sa {QMediaMetaData}
*/
/*!
\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}
*/

131
src/imports/multimedia/qdeclarativecamera.cpp
View File

@@ -84,10 +84,6 @@ void QDeclarativeCamera::_q_availabilityChanged(QMultimedia::AvailabilityStatus
viewfinder you can use \l VideoOutput with the Camera set as the source.
\qml
import QtQuick 2.0
import QtMultimedia 5.4
Item {
width: 640
height: 360
@@ -778,7 +774,16 @@ void QDeclarativeCamera::setDigitalZoom(qreal value)
/*!
\qmlproperty variant QtMultimedia::Camera::mediaObject
This property holds the media object for the camera.
This property holds the native media object for the camera.
It can be used to get a pointer to a QCamera object in order to integrate with C++ code.
\code
QObject *qmlCamera; // The QML Camera object
QCamera *camera = qvariant_cast<QCamera *>(qmlCamera->property("mediaObject"));
\endcode
\note This property is not accessible from QML.
*/
/*!
@@ -866,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

3
src/imports/multimedia/qdeclarativecameracapture.cpp
View File

@@ -57,9 +57,6 @@ QT_BEGIN_NAMESPACE
and cannot be created directly.
\qml
import QtQuick 2.0
import QtMultimedia 5.0
Item {
width: 640
height: 360

4
src/imports/multimedia/qdeclarativecameraexposure.cpp
View File

@@ -44,8 +44,6 @@ QT_BEGIN_NAMESPACE
\ingroup camera_qml
\inqmlmodule QtMultimedia
This type is part of the \b{QtMultimedia 5.0} module.
CameraExposure allows you to adjust exposure related settings
like aperture and shutter speed, metering and ISO speed.
@@ -53,8 +51,6 @@ QT_BEGIN_NAMESPACE
\c exposure property of the a \l Camera should be used.
\qml
import QtQuick 2.0
import QtMultimedia 5.0
Camera {
id: camera

12
src/imports/multimedia/qdeclarativecameraflash.cpp
View File

@@ -44,8 +44,6 @@ QT_BEGIN_NAMESPACE
\ingroup multimedia_qml
\ingroup camera_qml
CameraFlash is part of the \b{QtMultimedia 5.0} module.
This type allows you to operate the camera flash
hardware and control the flash mode used. Not all cameras have
flash hardware (and in some cases it is shared with the
@@ -55,8 +53,6 @@ QT_BEGIN_NAMESPACE
\c flash property of a \l Camera should be used.
\qml
import QtQuick 2.0
import QtMultimedia 5.0
Camera {
id: camera
@@ -81,11 +77,7 @@ QDeclarativeCameraFlash::QDeclarativeCameraFlash(QCamera *camera, QObject *paren
QDeclarativeCameraFlash::~QDeclarativeCameraFlash()
{
}
/*!
\property bool QDeclarativeCameraFlash::ready
This property indicates whether the flash is charged.
*/
/*!
\qmlproperty bool QtMultimedia::CameraFlash::ready
@@ -95,11 +87,7 @@ bool QDeclarativeCameraFlash::isFlashReady() const
{
return m_exposure->isFlashReady();
}
/*!
\property QDeclarativeCameraFlash::mode
This property holds the camera flash mode. The mode can be one of the constants in \l QCameraExposure::FlashMode.
*/
/*!
\qmlproperty enumeration QtMultimedia::CameraFlash::mode

4
src/imports/multimedia/qdeclarativecamerafocus.cpp
View File

@@ -44,8 +44,6 @@ QT_BEGIN_NAMESPACE
\ingroup multimedia_qml
\ingroup camera_qml
CameraFocus is part of the \b{QtMultimedia 5.0} module.
This type allows control over manual and automatic
focus settings, including information about any parts of the
camera frame that are selected for autofocusing.
@@ -54,8 +52,6 @@ QT_BEGIN_NAMESPACE
\c focus property of a \l Camera should be used.
\qml
import QtQuick 2.0
import QtMultimedia 5.0
Item {
width: 640

4
src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
View File

@@ -52,8 +52,6 @@ QT_BEGIN_NAMESPACE
\c imageProcessing property of a \l Camera should be used.
\qml
import QtQuick 2.0
import QtMultimedia 5.0
Camera {
id: camera
@@ -220,7 +218,7 @@ void QDeclarativeCameraImageProcessing::setDenoisingLevel(qreal value)
}
/*!
\qmlproperty QtMultimedia::CameraImageProcessing::colorFilter
\qmlproperty enumeration QtMultimedia::CameraImageProcessing::colorFilter
This property holds which color filter if any will be applied to image data captured by the camera.

6
src/imports/multimedia/qdeclarativemultimediaglobal.cpp
View File

@@ -51,9 +51,6 @@ It is not instantiable; to use it, call the members of the global \c QtMultimedi
For example:
\qml
import QtQuick 2.0
import QtMultimedia 5.4
Camera {
deviceId: QtMultimedia.defaultCamera.deviceId
}
@@ -121,9 +118,6 @@ Camera {
the active camera by selecting one of the items in the list.
\qml
import QtQuick 2.0
import QtMultimedia 5.4
Item {
Camera {

5
src/imports/multimedia/qdeclarativeradio.cpp
View File

@@ -45,12 +45,7 @@ QT_BEGIN_NAMESPACE
\ingroup multimedia_radio_qml
\inherits Item
Radio is part of the \b{QtMultimedia 5.0} module.
\qml
import QtQuick 2.0
import QtMultimedia 5.0
Rectangle {
width: 320
height: 480

5
src/imports/multimedia/qdeclarativeradiodata.cpp
View File

@@ -44,17 +44,12 @@ QT_BEGIN_NAMESPACE
\ingroup multimedia_radio_qml
\inherits Item
This type is part of the \b{QtMultimedia 5.0} module.
\c RadioData is your gateway to all the data available through RDS. RDS is the Radio Data System
which allows radio stations to broadcast information like the \l stationId, \l programType, \l programTypeName,
\l stationName, and \l radioText. This information can be read from the \c RadioData. It also allows
you to set whether the radio should tune to alternative frequencies if the current signal strength falls too much.
\qml
import QtQuick 2.0
import QtMultimedia 5.0
Rectangle {
width: 480
height: 320

4
src/imports/multimedia/qdeclarativetorch.cpp
View File

@@ -46,16 +46,12 @@ QT_BEGIN_NAMESPACE
\ingroup multimedia_qml
\c Torch is part of the \b{QtMultimedia 5.0} module.
In many cases the torch hardware is shared with camera flash functionality,
and might be automatically controlled by the device. You have control over
the power level (of course, higher power levels are brighter but reduce
battery life significantly).
\qml
import QtQuick 2.0
import QtMultimedia 5.0
Torch {
power: 75 // 75% of full power