diff options
| author | Piotr Srebrny <piotr.srebrny@qt.io> | 2021-09-09 15:00:51 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-09 18:33:29 +0000 |
| commit | b776692931cb136969e09b239fc1362bd96c9b64 (patch) | |
| tree | d591e1728b4ea6946b73a937a03b00929fc742ad | |
| parent | 48d0bdec9f777d3093ecc0608220de53a526384c (diff) | |
Do not discard track that do not have language information
Many track do not have the languange information or it may be not
relevant, like in the case of video content. Instead of discarding these
tracks give them a default track_x name.
Fix how track indexes are handled.
Change-Id: Ic8a3cf6feb6d00e05f317e4085ee852f71e4352d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
(cherry picked from commit 9bcb332f599fc7f2dccfac688d8d019533ccab76)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | examples/multimedia/video/mediaplayer/TracksInfo.qml | 9 | ||||
| -rw-r--r-- | examples/multimedia/video/mediaplayer/main.qml | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/examples/multimedia/video/mediaplayer/TracksInfo.qml b/examples/multimedia/video/mediaplayer/TracksInfo.qml index ad30a6beb..f2851228a 100644 --- a/examples/multimedia/video/mediaplayer/TracksInfo.qml +++ b/examples/multimedia/video/mediaplayer/TracksInfo.qml @@ -74,11 +74,9 @@ Item { metadataList.forEach(function (metadata, index) { var language = metadata.stringValue(LanguageKey); - if (!language) - return; - + var label = language ? metadata.stringValue(LanguageKey) : "track " + (index + 1) elements.append( - { language: metadata.stringValue(LanguageKey) + { language: label , trackNumber: index }) }); @@ -107,8 +105,7 @@ Item { delegate: RowLayout { width: trackList.width RadioButton { - property int trackIndex : index - checked: trackIndex === selectedTrack +1 + checked: model.trackNumber === selectedTrack text: model.language ButtonGroup.group: group onClicked: selectedTrack = model.trackNumber diff --git a/examples/multimedia/video/mediaplayer/main.qml b/examples/multimedia/video/mediaplayer/main.qml index 6ea8b4135..84e0e8647 100644 --- a/examples/multimedia/video/mediaplayer/main.qml +++ b/examples/multimedia/video/mediaplayer/main.qml @@ -84,11 +84,11 @@ Window { onMetaDataChanged: { metadataInfo.read(mediaPlayer.metaData) } onTracksChanged: { audioTracksInfo.read(mediaPlayer.audioTracks); - audioTracksInfo.selectedTrack = mediaPlayer.activeAudioTrack +1; + audioTracksInfo.selectedTrack = mediaPlayer.activeAudioTrack; videoTracksInfo.read(mediaPlayer.videoTracks); - videoTracksInfo.selectedTrack = mediaPlayer.activeVideoTrack +1; + videoTracksInfo.selectedTrack = mediaPlayer.activeVideoTrack; subtitleTracksInfo.read(mediaPlayer.subtitleTracks); - subtitleTracksInfo.selectedTrack = mediaPlayer.activeSubtitleTrack +1; + subtitleTracksInfo.selectedTrack = mediaPlayer.activeSubtitleTrack; } } |