From 36486d10d14ab36818e759af42009d9b7613199e Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Fri, 26 Aug 2011 17:11:34 +0200 Subject: [PATCH] * Notify user even when there's no album for the current track. --- src/libtomahawk/audio/audioengine.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/audioengine.cpp index dc07f4d6b..e85c54bf9 100644 --- a/src/libtomahawk/audio/audioengine.cpp +++ b/src/libtomahawk/audio/audioengine.cpp @@ -213,7 +213,7 @@ AudioEngine::canGoNext() return false; tDebug( LOGEXTRA ) << Q_FUNC_INFO << "playlist has next item? " << m_playlist.data()->hasNextItem(); - + return m_playlist.data()->hasNextItem(); } @@ -328,16 +328,15 @@ AudioEngine::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, } if ( m_currentTrack.isNull() || - m_currentTrack.data()->track().isNull() || - m_currentTrack.data()->artist().isNull() || - m_currentTrack.data()->album().isNull() ) + m_currentTrack->track().isNull() || + m_currentTrack->artist().isNull() ) return; QVariantMap playInfo; - playInfo["message"] = QString( "Tomahawk is playing \"%1\" by %2 on album %3." ) - .arg( m_currentTrack->track() ) - .arg( m_currentTrack->artist()->name() ) - .arg( m_currentTrack->album()->name() ); + playInfo["message"] = tr( "Tomahawk is playing \"%1\" by %2%3." ) + .arg( m_currentTrack->track() ) + .arg( m_currentTrack->artist()->name() ) + .arg( m_currentTrack->album().isNull() ? QString() : tr( " on album %1" ).arg( m_currentTrack->album()->name() ) ); if ( !output.isNull() && output.isValid() ) { QVariantMap returnedData = output.value< QVariantMap >(); @@ -634,7 +633,7 @@ AudioEngine::setPlaylist( PlaylistInterface* playlist ) if ( !playlist ) return; - + m_playlist = playlist->getSharedPointer(); if ( m_playlist.data()->object() && m_playlist.data()->retryMode() == PlaylistInterface::Retry )