diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-08-29 13:01:25 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-09-01 12:55:59 +0200 |
commit | 0f091a399b3cd5207f2c873b82e02fedbad64538 (patch) | |
tree | 5b0c32e635976c8ba63dfb8098035dd8011f0ad1 | |
parent | e0433778aec0cd2de12103142d3d5fb49c43aa66 (diff) |
Correctly show the buffer status in the player example
QMediaPlayer::bufferProgress() is float based in Qt 6 and return a
number between 0 and 1. Adjust the player example to correctly
convert the numbers.
Pick-to: 6.2
Change-Id: Iaec285b91e9e82c88fb976da4c5b346155bc8998
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r-- | examples/multimediawidgets/player/player.cpp | 11 | ||||
-rw-r--r-- | examples/multimediawidgets/player/player.h | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp index d216feb3a..ff40b7e0c 100644 --- a/examples/multimediawidgets/player/player.cpp +++ b/examples/multimediawidgets/player/player.cpp @@ -434,10 +434,10 @@ void Player::statusChanged(QMediaPlayer::MediaStatus status) break; case QMediaPlayer::BufferingMedia: case QMediaPlayer::BufferedMedia: - setStatusInfo(tr("Buffering %1%").arg(m_player->bufferProgress())); + setStatusInfo(tr("Buffering %1%").arg(qRound(m_player->bufferProgress()*100.))); break; case QMediaPlayer::StalledMedia: - setStatusInfo(tr("Stalled %1%").arg(m_player->bufferProgress())); + setStatusInfo(tr("Stalled %1%").arg(qRound(m_player->bufferProgress()*100.))); break; case QMediaPlayer::EndOfMedia: QApplication::alert(this); @@ -467,12 +467,13 @@ void Player::handleCursor(QMediaPlayer::MediaStatus status) #endif } -void Player::bufferingProgress(int progress) +void Player::bufferingProgress(float progress) { + qDebug() << "buffering progress" << progress; if (m_player->mediaStatus() == QMediaPlayer::StalledMedia) - setStatusInfo(tr("Stalled %1%").arg(progress)); + setStatusInfo(tr("Stalled %1%").arg(qRound(progress*100.))); else - setStatusInfo(tr("Buffering %1%").arg(progress)); + setStatusInfo(tr("Buffering %1%").arg(qRound(progress*100.))); } void Player::videoAvailableChanged(bool available) diff --git a/examples/multimediawidgets/player/player.h b/examples/multimediawidgets/player/player.h index 0be2282f8..89bf39008 100644 --- a/examples/multimediawidgets/player/player.h +++ b/examples/multimediawidgets/player/player.h @@ -101,7 +101,7 @@ private slots: void statusChanged(QMediaPlayer::MediaStatus status); void stateChanged(QMediaPlayer::PlaybackState state); - void bufferingProgress(int progress); + void bufferingProgress(float progress); void videoAvailableChanged(bool available); void selectAudioStream(); |