From dfa2a80d82137327016e248f30002bad81291f13 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 7 Apr 2012 09:54:50 +0200 Subject: [PATCH] * Work-around VLC bug: reset volume when resuming. --- src/libtomahawk/audio/audioengine.cpp | 4 +++- src/libtomahawk/audio/audioengine.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/audioengine.cpp index 31129bc0e..c2aaea5bb 100644 --- a/src/libtomahawk/audio/audioengine.cpp +++ b/src/libtomahawk/audio/audioengine.cpp @@ -132,7 +132,9 @@ AudioEngine::play() if ( isPaused() ) { + setVolume( m_volume ); m_mediaObject->play(); + setVolume( m_volume ); emit resumed(); if ( TomahawkSettings::instance()->privateListeningMode() != TomahawkSettings::FullyPrivate ) @@ -145,7 +147,6 @@ AudioEngine::play() trackInfo["albumpos"] = QString::number( m_currentTrack->albumpos() ); trackInfo["duration"] = QString::number( m_currentTrack->duration() ); - Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( s_aeInfoIdentifier, Tomahawk::InfoSystem::InfoNowResumed, QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo ), @@ -162,6 +163,7 @@ AudioEngine::pause() { tDebug( LOGEXTRA ) << Q_FUNC_INFO; + m_volume = volume(); m_mediaObject->pause(); emit paused(); diff --git a/src/libtomahawk/audio/audioengine.h b/src/libtomahawk/audio/audioengine.h index 4928fd6c4..345572401 100644 --- a/src/libtomahawk/audio/audioengine.h +++ b/src/libtomahawk/audio/audioengine.h @@ -160,6 +160,7 @@ private: mutable QStringList m_supportedMimeTypes; AudioState m_state; + unsigned int m_volume; static AudioEngine* s_instance; };