summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia/qdeclarativeaudio.cpp
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/imports/multimedia/qdeclarativeaudio.cpp
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/imports/multimedia/qdeclarativeaudio.cpp')
-rw-r--r--src/imports/multimedia/qdeclarativeaudio.cpp20
1 files changed, 16 insertions, 4 deletions
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index 37509b17e..83e420196 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -601,8 +601,14 @@ bool QDeclarativeAudio::hasVideo() const
/*!
\qmlproperty real QtMultimedia::Audio::bufferProgress
- This property holds how much of the data buffer is currently filled, from 0.0 (empty) to 1.0
- (full).
+ This property holds how much of the data buffer is currently filled, from \c 0.0 (empty) to
+ \c 1.0 (full).
+
+ Playback can start or resume only when the buffer is entirely filled, in which case the
+ status is \c Audio.Buffered or \c Audio.Buffering. A value lower than \c 1.0 implies that
+ the status is \c Audio.Stalled.
+
+ \sa status
*/
/*!
@@ -1394,8 +1400,14 @@ void QDeclarativeAudio::_q_statusChanged()
/*!
\qmlproperty real QtMultimedia::MediaPlayer::bufferProgress
- This property holds how much of the data buffer is currently filled, from 0.0 (empty) to 1.0
- (full).
+ This property holds how much of the data buffer is currently filled, from \c 0.0 (empty) to
+ \c 1.0 (full).
+
+ Playback can start or resume only when the buffer is entirely filled, in which case the
+ status is \c MediaPlayer.Buffered or \c MediaPlayer.Buffering. A value lower than \c 1.0
+ implies that the status is \c MediaPlayer.Stalled.
+
+ \sa status
*/
/*!