logo       

[Amarok] Fixed StandardTrackNavigator to use topmost proxy: msg#12835

kde-commits

Subject: [Amarok] Fixed StandardTrackNavigator to use topmost proxy

commit 5c4f807465fb8958b590f794aadc4a58de824b50
Author: Teo Mrnjavac <teo.mrnjavac@xxxxxxxxx>
AuthorDate: Fri Jul 31 14:05:29 2009 +0200
Commit: Teo Mrnjavac <teo.mrnjavac@xxxxxxxxx>
CommitDate: Fri Jul 31 14:05:29 2009 +0200

Fixed StandardTrackNavigator to use topmost proxy order.

diff --git a/src/playlist/navigators/StandardTrackNavigator.cpp
b/src/playlist/navigators/StandardTrackNavigator.cpp
index c58df90..6990b2b 100644
--- a/src/playlist/navigators/StandardTrackNavigator.cpp
+++ b/src/playlist/navigators/StandardTrackNavigator.cpp
@@ -26,9 +26,9 @@
quint64
Playlist::StandardTrackNavigator::requestNextTrack()
{
+ m_model = GroupingProxy::instance();
if( !m_queue.isEmpty() )
return m_queue.takeFirst();
-
int updateRow = m_model->activeRow() + 1;
if ( m_repeatPlaylist )
updateRow = ( updateRow >= m_model->rowCount() ) ? 0 : updateRow;
@@ -38,6 +38,7 @@ Playlist::StandardTrackNavigator::requestNextTrack()
quint64
Playlist::StandardTrackNavigator::requestLastTrack()
{
+ m_model = GroupingProxy::instance();
int updateRow = m_model->activeRow() - 1;
if ( m_repeatPlaylist )
updateRow = ( updateRow < 0 ) ? m_model->rowCount() - 1 : updateRow;
diff --git a/src/playlist/navigators/StandardTrackNavigator.h
b/src/playlist/navigators/StandardTrackNavigator.h
index 61596b1..7bd6769 100644
--- a/src/playlist/navigators/StandardTrackNavigator.h
+++ b/src/playlist/navigators/StandardTrackNavigator.h
@@ -23,20 +23,20 @@

namespace Playlist
{
- /**
- * Simply plays the next track and stops playing when the playlist is
finished.
- */
- class StandardTrackNavigator : public TrackNavigator
- {
- public:
- StandardTrackNavigator() { }
+/**
+ * Simply plays the next track and stops playing when the playlist is finished.
+ */
+class StandardTrackNavigator : public TrackNavigator
+{
+public:
+ StandardTrackNavigator() { }

- quint64 requestNextTrack();
- quint64 requestUserNextTrack() { return requestNextTrack(); }
- quint64 requestLastTrack();
+ quint64 requestNextTrack();
+ quint64 requestUserNextTrack() { return requestNextTrack(); }
+ quint64 requestLastTrack();

- void reset() {};
- };
+ void reset() {};
+};

}



<Prev in Thread] Current Thread [Next in Thread>
Google Custom Search

News | Mail Home | sitemap | FAQ | advertise