mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 22:26:32 +02:00
Code Issues Releases Wiki Activity

* Notify user even when there's no album for the current track.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-08-26 17:11:34 +02:00
parent c7e2a5c1c1
commit 36486d10d1
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libtomahawk/audio/audioengine.cpp
View File

@@ -213,7 +213,7 @@ AudioEngine::canGoNext()
return false; return false;
tDebug( LOGEXTRA ) << Q_FUNC_INFO << "playlist has next item? " << m_playlist.data()->hasNextItem(); tDebug( LOGEXTRA ) << Q_FUNC_INFO << "playlist has next item? " << m_playlist.data()->hasNextItem();
return m_playlist.data()->hasNextItem(); return m_playlist.data()->hasNextItem();
} }
@@ -328,16 +328,15 @@ AudioEngine::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData,
} }
if ( m_currentTrack.isNull() || if ( m_currentTrack.isNull() ||
m_currentTrack.data()->track().isNull() || m_currentTrack->track().isNull() ||
m_currentTrack.data()->artist().isNull() || m_currentTrack->artist().isNull() )
m_currentTrack.data()->album().isNull() )
return; return;
QVariantMap playInfo; QVariantMap playInfo;
playInfo["message"] = QString( "Tomahawk is playing \"%1\" by %2 on album %3." ) playInfo["message"] = tr( "Tomahawk is playing \"%1\" by %2%3." )
.arg( m_currentTrack->track() ) .arg( m_currentTrack->track() )
.arg( m_currentTrack->artist()->name() ) .arg( m_currentTrack->artist()->name() )
.arg( m_currentTrack->album()->name() ); .arg( m_currentTrack->album().isNull() ? QString() : tr( " on album %1" ).arg( m_currentTrack->album()->name() ) );
if ( !output.isNull() && output.isValid() ) if ( !output.isNull() && output.isValid() )
{ {
QVariantMap returnedData = output.value< QVariantMap >(); QVariantMap returnedData = output.value< QVariantMap >();
@@ -634,7 +633,7 @@ AudioEngine::setPlaylist( PlaylistInterface* playlist )
if ( !playlist ) if ( !playlist )
return; return;
m_playlist = playlist->getSharedPointer(); m_playlist = playlist->getSharedPointer();
if ( m_playlist.data()->object() && m_playlist.data()->retryMode() == PlaylistInterface::Retry ) if ( m_playlist.data()->object() && m_playlist.data()->retryMode() == PlaylistInterface::Retry )