Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I7dc36a224702721b67ffa2cf7f9ce2a6b047f88e
2014-01-10 18:30:14 +01:00
parent b0481d4b47 da89319f38
commit d2545bd40f
20 changed files with 267 additions and 24 deletions
--- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp
+++ b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp
@@ -530,7 +530,7 @@ void MmRendererMediaPlayerControl::play()
    }

    setPositionInternal(m_position);
-    setVolumeInternal(m_volume);
+    setVolumeInternal(m_muted ? 0 : m_volume);
    setPlaybackRateInternal(m_rate);

    if (mmr_play(m_context) != 0) {