andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix failing test_initial_playlist_position

Browse Source
This commit is contained in:
Thomas Adamcik 2010-02-14 04:08:28 +01:00
parent 7f0dff0891
commit 6ecadd6ca1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mopidy/backends/__init__.py
View File

@ -119,7 +119,7 @@ class BasePlaybackController(object):
try:
if self.current_track is None:
return playlist.tracks[self.playlist_position]
return playlist.tracks[0]
return playlist.tracks[self.playlist_position + 1]
except IndexError:
return None
@ -145,4 +145,4 @@ class BasePlaybackController(object):
try:
return playlist.tracks.index(self.current_track)
except ValueError:
return 0
return None

6
mopidy/backends/gstreamer.py
View File

@ -67,7 +67,7 @@ class GStreamerPlaybackController(BasePlaybackController):
elif not self.current_track and not playlist.tracks:
return False
elif playlist.tracks:
self.current_track = playlist.tracks[self.playlist_position]
self.current_track = playlist.tracks[0]
self.bin.set_property("uri", self.current_track.uri)
self.bin.set_state(gst.STATE_PLAYING)
@ -80,7 +80,9 @@ class GStreamerPlaybackController(BasePlaybackController):
def next(self):
playlist = self.backend.current_playlist.playlist
if self.playlist_position + 1 >= len(playlist.tracks):
if not self.current_track:
self.play()
elif self.playlist_position + 1 >= len(playlist.tracks):
self.stop()
else:
next_track = playlist.tracks[self.playlist_position+1]