From 53251c1ba5cf304151448b6afa929175a66e4e13 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 28 Nov 2012 13:29:35 +0100 Subject: [PATCH] * More consistent PlaylistInterface API. --- src/libtomahawk/PlaylistInterface.cpp | 4 ++-- src/libtomahawk/audio/AudioEngine.cpp | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/libtomahawk/PlaylistInterface.cpp b/src/libtomahawk/PlaylistInterface.cpp index c349112d8..3340759d4 100644 --- a/src/libtomahawk/PlaylistInterface.cpp +++ b/src/libtomahawk/PlaylistInterface.cpp @@ -159,12 +159,12 @@ PlaylistInterface::filterTracks( const QList& queries ) bool PlaylistInterface::hasNextResult() const { - return ( currentItem() && siblingResult( 1 ) ); + return ( siblingResult( 1 ) ); } bool PlaylistInterface::hasPreviousResult() const { - return ( currentItem() && siblingResult( -1 ) ); + return ( siblingResult( -1 ) ); } diff --git a/src/libtomahawk/audio/AudioEngine.cpp b/src/libtomahawk/audio/AudioEngine.cpp index 72503ec73..ebdd2fce8 100644 --- a/src/libtomahawk/audio/AudioEngine.cpp +++ b/src/libtomahawk/audio/AudioEngine.cpp @@ -227,11 +227,13 @@ AudioEngine::canGoNext() return false; if ( m_playlist.data()->skipRestrictions() == PlaylistModes::NoSkip || - m_playlist.data()->skipRestrictions() == PlaylistModes::NoSkipForwards ) + m_playlist.data()->skipRestrictions() == PlaylistModes::NoSkipForwards ) + { return false; + } 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 //you're following hasn't started a new track yet...don't do anything @@ -239,7 +241,7 @@ AudioEngine::canGoNext() 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 ) return false; - return ( m_playlist.data()->hasPreviousResult() && m_playlist.data()->previousResult()->isOnline() ); + return ( m_currentTrack && m_playlist.data()->hasPreviousResult() && m_playlist.data()->previousResult()->isOnline() ); }