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

core: Remove playback.track_at_previous

Browse Source
This commit is contained in:
Stein Magnus Jodal 2012-11-20 09:44:09 +01:00
parent 4c19321500
commit 2f27167677
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changes.rst
View File

@ -149,6 +149,9 @@ backends:
This makes it possible to support lookup of artist or album URIs which then
can expand to a list of tracks.
- Remove :attr:`mopidy.core.PlaybackController.track_at_previous`. Use
:attr:`mopidy.core.PlaybackController.tl_track_at_previous` instead.
- Remove :attr:`mopidy.core.PlaybackController.track_at_next`. Use
:attr:`mopidy.core.PlaybackController.tl_track_at_next` instead.

11
mopidy/core/playback.py
View File

@ -196,17 +196,6 @@ class PlaybackController(object):
before the list repeats.
"""
def get_track_at_previous(self):
return self.tl_track_at_previous and self.tl_track_at_previous.track
track_at_previous = property(get_track_at_previous)
"""
The track that will be played if calling :meth:`previous()`.
Read-only. A :class:`mopidy.models.Track` extracted from
:attr:`tl_track_at_previous` for convenience.
"""
def get_tl_track_at_previous(self):
if self.repeat or self.consume or self.random:
return self.current_tl_track

16
tests/backends/base/playback.py
View File

@ -434,18 +434,18 @@ class PlaybackControllerTest(object):
@populate_tracklist
def test_previous_track_before_play(self):
self.assertEqual(self.playback.track_at_previous, None)
self.assertEqual(self.playback.tl_track_at_previous, None)
@populate_tracklist
def test_previous_track_after_play(self):
self.playback.play()
self.assertEqual(self.playback.track_at_previous, None)
self.assertEqual(self.playback.tl_track_at_previous, None)
@populate_tracklist
def test_previous_track_after_next(self):
self.playback.play()
self.playback.next()
self.assertEqual(self.playback.track_at_previous, self.tracks[0])
self.assertEqual(self.playback.tl_track_at_previous, self.tl_tracks[0])
@populate_tracklist
def test_previous_track_after_previous(self):
@ -453,10 +453,10 @@ class PlaybackControllerTest(object):
self.playback.next() # At track 1
self.playback.next() # At track 2
self.playback.previous() # At track 1
self.assertEqual(self.playback.track_at_previous, self.tracks[0])
self.assertEqual(self.playback.tl_track_at_previous, self.tl_tracks[0])
def test_previous_track_empty_playlist(self):
self.assertEqual(self.playback.track_at_previous, None)
self.assertEqual(self.playback.tl_track_at_previous, None)
@populate_tracklist
def test_previous_track_with_consume(self):
@ -464,7 +464,8 @@ class PlaybackControllerTest(object):
for _ in self.tracks:
self.playback.next()
self.assertEqual(
self.playback.track_at_previous, self.playback.current_track)
self.playback.tl_track_at_previous,
self.playback.current_tl_track)
@populate_tracklist
def test_previous_track_with_random(self):
@ -472,7 +473,8 @@ class PlaybackControllerTest(object):
for _ in self.tracks:
self.playback.next()
self.assertEqual(
self.playback.track_at_previous, self.playback.current_track)
self.playback.tl_track_at_previous,
self.playback.current_tl_track)
@populate_tracklist
def test_initial_current_track(self):