From 13b74f1c21c21caf02b877d0ae4bf8e4a83bf52e Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 19 May 2012 10:28:44 +0200 Subject: [PATCH] * Allow seeking without playlists and emit stopped() only after we actually stopped. --- src/libtomahawk/audio/AudioEngine.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/audio/AudioEngine.cpp b/src/libtomahawk/audio/AudioEngine.cpp index eab4d246e..496efaeed 100644 --- a/src/libtomahawk/audio/AudioEngine.cpp +++ b/src/libtomahawk/audio/AudioEngine.cpp @@ -162,12 +162,12 @@ AudioEngine::stop() { tDebug( LOGEXTRA ) << Q_FUNC_INFO; - emit stopped(); if ( isStopped() ) return; setState( Stopped ); m_mediaObject->stop(); + emit stopped(); if ( !m_playlist.isNull() ) m_playlist.data()->reset(); @@ -180,7 +180,6 @@ AudioEngine::stop() sendWaitingNotification(); Tomahawk::InfoSystem::InfoPushData pushData( s_aeInfoIdentifier, Tomahawk::InfoSystem::InfoNowStopped, QVariant(), Tomahawk::InfoSystem::PushNoFlag ); - Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( pushData ); } @@ -255,6 +254,10 @@ AudioEngine::canSeek() if ( m_mediaObject && m_mediaObject->isValid() ) phononCanSeek = m_mediaObject->isSeekable(); */ + + if ( m_playlist.isNull() ) + return phononCanSeek; + return !m_playlist.isNull() && ( m_playlist.data()->seekRestrictions() != PlaylistInterface::NoSeek ) && phononCanSeek; }