diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-09-21 10:41:39 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-09-21 23:00:06 +0200 |
| commit | 5777fe84cf1e7c15c7905b549a34f1df946eab96 (patch) | |
| tree | 9a76e08e3eb0f0b716aa3e36e82047e5f6f78e66 /src/multimedia/playback | |
| parent | 31fa752209c4a6dfbd0aa7874350fd0ba37f8623 (diff) | |
Fix API naming inconsistency
The QML type should be MediaMetaData (as the namespace
is mediaMetaData).
Pick-to: 6.2 6.2.0
Change-Id: I0b45ef390fc9662c534033977f56d3ce607bcb3e
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/multimedia/playback')
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 478fd2950..a2008c4ca 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -667,18 +667,16 @@ QAudioOutput *QMediaPlayer::audioOutput() const } /*! - \qmlproperty QList<QMediaMetaData> QtMultimedia::MediaPlayer::audioTracks + \qmlproperty list<mediaMetaData> QtMultimedia::MediaPlayer::audioTracks This property holds a list of metadata. Each index refers to an audio track. - The metadata holds 2 properties; - \list - \li \l{QtMultimedia::MediaPlayer::metaData.language}{Language} - \li \l{QtMultimedia::MediaPlayer::metaData.mediaType}{MimeType} - \endlist + The metadata holds properties describing the individual tracks. For + audio tracks the \l{language}{MediaMetaData::Language} is usually the most + important property. - \sa {MetaData} + \sa MediaMetaData */ /*! @@ -696,18 +694,14 @@ QList<QMediaMetaData> QMediaPlayer::audioTracks() const } /*! - \qmlproperty QList<QMediaMetaData> QtMultimedia::MediaPlayer::videoTracks + \qmlproperty list<mediaMetaData> QtMultimedia::MediaPlayer::videoTracks This property holds a list of metadata. Each index refers to a video track. - The metadata holds 2 properties; - \list - \li \l{QtMultimedia::MediaPlayer::metaData.language}{Language} - \li \l{QtMultimedia::MediaPlayer::metaData.mediaType}{MimeType} - \endlist + The metadata holds properties describing the individual tracks. - \sa {MetaData} + \sa MediaMetaData */ /*! @@ -723,18 +717,16 @@ QList<QMediaMetaData> QMediaPlayer::videoTracks() const } /*! - \qmlproperty QList<QMediaMetaData> QtMultimedia::MediaPlayer::subtitleTracks + \qmlproperty list<mediaMetaData> QtMultimedia::MediaPlayer::subtitleTracks This property holds a list of metadata. Each index refers to a subtitle track. - The metadata holds 2 properties; - \list - \li \l{QtMultimedia::MediaPlayer::metaData.language}{Language} - \li \l{QtMultimedia::MediaPlayer::metaData.mediaType}{MimeType} - \endlist + The metadata holds properties describing the individual tracks. For + subtitle tracks the \l{language}{MediaMetaData::Language} is usually the most + important property. - \sa {MetaData} + \sa MediaMetaData */ /*! |