diff options
Diffstat (limited to 'src/multimedia/playback')
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 10 | ||||
| -rw-r--r-- | src/multimedia/playback/qmediaplaylist.cpp | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index c5261921a..648c13220 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -1372,8 +1372,14 @@ QList<QAudio::Role> QMediaPlayer::supportedAudioRoles() const \property QMediaPlayer::volume \brief the current playback volume. - The playback volume is linear in effect and the value can range from 0 - - 100, values outside this range will be clamped. + The playback volume is scaled linearly, ranging from \c 0 (silence) to \c 100 (full volume). + Values outside this range will be clamped. + + By default the volume is \c 100. + + UI volume controls should usually be scaled nonlinearly. For example, using a logarithmic scale + will produce linear changes in perceived loudness, which is what a user would normally expect + from a volume control. See QAudio::convertVolume() for more details. */ /*! diff --git a/src/multimedia/playback/qmediaplaylist.cpp b/src/multimedia/playback/qmediaplaylist.cpp index 4ffcad398..97fe75044 100644 --- a/src/multimedia/playback/qmediaplaylist.cpp +++ b/src/multimedia/playback/qmediaplaylist.cpp @@ -448,10 +448,12 @@ bool QMediaPlaylist::clear() bool QMediaPlaylistPrivate::readItems(QMediaPlaylistReader *reader) { + QList<QMediaContent> items; + while (!reader->atEnd()) - playlist()->addMedia(reader->readItem()); + items.append(reader->readItem()); - return true; + return playlist()->addMedia(items); } bool QMediaPlaylistPrivate::writeItems(QMediaPlaylistWriter *writer) |