mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-11 00:24:12 +02:00
Code Issues Releases Wiki Activity

* More consistent PlaylistInterface API.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-11-28 13:29:35 +01:00
parent a79a360ce2
commit 53251c1ba5
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libtomahawk/PlaylistInterface.cpp
View File

@@ -159,12 +159,12 @@ PlaylistInterface::filterTracks( const QList<Tomahawk::query_ptr>& queries )
bool bool
PlaylistInterface::hasNextResult() const PlaylistInterface::hasNextResult() const
{ {
return ( currentItem() && siblingResult( 1 ) ); return ( siblingResult( 1 ) );
} }
bool bool
PlaylistInterface::hasPreviousResult() const PlaylistInterface::hasPreviousResult() const
{ {
return ( currentItem() && siblingResult( -1 ) ); return ( siblingResult( -1 ) );
} }

10
src/libtomahawk/audio/AudioEngine.cpp
View File

@@ -227,11 +227,13 @@ AudioEngine::canGoNext()
return false; return false;
if ( m_playlist.data()->skipRestrictions() == PlaylistModes::NoSkip || if ( m_playlist.data()->skipRestrictions() == PlaylistModes::NoSkip ||
m_playlist.data()->skipRestrictions() == PlaylistModes::NoSkipForwards ) m_playlist.data()->skipRestrictions() == PlaylistModes::NoSkipForwards )
{
return false; return false;
}
if ( !m_currentTrack.isNull() && !m_playlist->hasNextResult() && if ( !m_currentTrack.isNull() && !m_playlist->hasNextResult() &&
( m_playlist->currentItem().isNull() || ( m_currentTrack->id() == m_playlist->currentItem()->id() ) ) ) ( m_playlist->currentItem().isNull() || ( m_currentTrack->id() == m_playlist->currentItem()->id() ) ) )
{ {
//For instance, when doing a catch-up while listening along, but the person //For instance, when doing a catch-up while listening along, but the person
//you're following hasn't started a new track yet...don't do anything //you're following hasn't started a new track yet...don't do anything
@@ -239,7 +241,7 @@ AudioEngine::canGoNext()
return false; return false;
} }
return ( m_playlist.data()->hasNextResult() && m_playlist.data()->nextResult()->isOnline() ); return ( m_currentTrack && m_playlist.data()->hasNextResult() && m_playlist.data()->nextResult()->isOnline() );
} }
@@ -253,7 +255,7 @@ AudioEngine::canGoPrevious()
m_playlist.data()->skipRestrictions() == PlaylistModes::NoSkipBackwards ) m_playlist.data()->skipRestrictions() == PlaylistModes::NoSkipBackwards )
return false; return false;
return ( m_playlist.data()->hasPreviousResult() && m_playlist.data()->previousResult()->isOnline() ); return ( m_currentTrack && m_playlist.data()->hasPreviousResult() && m_playlist.data()->previousResult()->isOnline() );
} }