From 9a3237d53332f48cc2e3c2910ed10b4e974d42bc Mon Sep 17 00:00:00 2001 From: Ling Hu Date: Thu, 8 Sep 2011 17:15:15 +1000 Subject: [PATCH] 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 Reviewed-by: Dmytro Poplavskiy --- src/imports/multimedia/qdeclarativemediabase.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/imports/multimedia/qdeclarativemediabase.cpp b/src/imports/multimedia/qdeclarativemediabase.cpp index 9303a4b2..a7435029 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);