summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@digia.com>2014-05-12 16:50:30 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-15 12:41:44 +0200
commit9cf77e3bb531320f3c982a88ee31df8a75482f13 (patch)
treefc9efe0fb0bba65cdbc10dee5631d3b5f34ad5dd /src/multimedia
parent64726bfd15458db8c5e80bac479ed3a35a6f652e (diff)
Improve documentation for the QMediaPlayer::bufferStatus property.
The corresponding properties in the Audio and MediaPlayer QML elements are also updated. Change-Id: I7104d274d431e7712db2f045c375756e8c2ac03a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/playback/qmediaplayer.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index bf6294a1e..cb054fe52 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -1238,12 +1238,14 @@ QMultimedia::AvailabilityStatus QMediaPlayer::availability() const
/*!
\property QMediaPlayer::bufferStatus
- \brief the percentage of the temporary buffer filled before playback begins.
+ \brief the percentage of the temporary buffer filled before playback begins or resumes, from
+ \c 0 (empty) to \c 100 (full).
When the player object is buffering; this property holds the percentage of
the temporary buffer that is filled. The buffer will need to reach 100%
- filled before playback can resume, at which time the MediaStatus will be
- BufferedMedia.
+ filled before playback can start or resume, at which time mediaStatus() will return
+ BufferedMedia or BufferingMedia. If the value is anything lower than \c 100, mediaStatus() will
+ return StalledMedia.
\sa mediaStatus()
*/