diff options
| author | Ling Hu <ling.hu@nokia.com> | 2011-09-08 17:15:15 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-20 16:50:12 +0200 |
| commit | 9a3237d53332f48cc2e3c2910ed10b4e974d42bc (patch) | |
| tree | 637df597d56011aeca74b6ebd92724761dbc3318 /src | |
| parent | 61c8412577664cd85860b26f7bca45986fb5acac (diff) | |
Don't re-set default properties in MediaBase::componentComplete
This is to avoid conflicting with state restore from background playback.
Change-Id: Idc5440b55a27bb5c5109717f405591e934bbedbc
Reviewed-on: http://codereview.qt-project.org/4397
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/multimedia/qdeclarativemediabase.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/imports/multimedia/qdeclarativemediabase.cpp b/src/imports/multimedia/qdeclarativemediabase.cpp index 9303a4b2f..a7435029b 100644 --- a/src/imports/multimedia/qdeclarativemediabase.cpp +++ b/src/imports/multimedia/qdeclarativemediabase.cpp @@ -316,9 +316,12 @@ void QDeclarativeMediaBase::setObject(QObject *object, const QMediaServiceProvid void QDeclarativeMediaBase::componentComplete() { - m_playerControl->setVolume(m_vol * 100); - m_playerControl->setMuted(m_muted); - m_playerControl->setPlaybackRate(m_playbackRate); + if (!qFuzzyCompare(m_vol, qreal(1.0))) + m_playerControl->setVolume(m_vol * 100); + if (m_muted) + m_playerControl->setMuted(m_muted); + if (!qFuzzyCompare(m_playbackRate, qreal(1.0))) + m_playerControl->setPlaybackRate(m_playbackRate); if (!m_source.isEmpty() && (m_autoLoad || m_playing)) // Override autoLoad if playing set m_playerControl->setMedia(m_source, 0); |