slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't re-set default properties in MediaBase::componentComplete

Browse Source 
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>
This commit is contained in:
Ling Hu
2011-09-08 17:15:15 +10:00
committed by Qt by Nokia
parent 61c8412577
commit 9a3237d533
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/imports/multimedia/qdeclarativemediabase.cpp
View File

@@ -316,9 +316,12 @@ void QDeclarativeMediaBase::setObject(QObject *object, const QMediaServiceProvid
void QDeclarativeMediaBase::componentComplete() void QDeclarativeMediaBase::componentComplete()
{ {
m_playerControl->setVolume(m_vol * 100); if (!qFuzzyCompare(m_vol, qreal(1.0)))
m_playerControl->setMuted(m_muted); m_playerControl->setVolume(m_vol * 100);
m_playerControl->setPlaybackRate(m_playbackRate); 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 if (!m_source.isEmpty() && (m_autoLoad || m_playing)) // Override autoLoad if playing set
m_playerControl->setMedia(m_source, 0); m_playerControl->setMedia(m_source, 0);