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

core.tracklist: Rename mark_{consumed => played}

Browse Source
This commit is contained in:
Stein Magnus Jodal 2013-10-19 20:12:14 +02:00
parent aaa3b2e93c
commit 0ea4fd6af0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mopidy/core/playback.py
View File

@ -165,7 +165,7 @@ class PlaybackController(object):
else: else:
self.stop(clear_current_track=True) self.stop(clear_current_track=True)
self.core.tracklist.mark_consumed(original_tl_track) self.core.tracklist.mark_played(original_tl_track)
def on_tracklist_change(self): def on_tracklist_change(self):
""" """

12
mopidy/core/tracklist.py
View File

@ -431,12 +431,6 @@ class TracklistController(object):
""" """
return self._tl_tracks[start:end] return self._tl_tracks[start:end]
def mark_consumed(self, tl_track):
if not self.consume:
return False
self.remove(tlid=tl_track.tlid)
return True
def mark_starting(self, tl_track): def mark_starting(self, tl_track):
if self.random and tl_track in self._shuffled: if self.random and tl_track in self._shuffled:
self._shuffled.remove(tl_track) self._shuffled.remove(tl_track)
@ -445,6 +439,12 @@ class TracklistController(object):
if self.random and self._shuffled: if self.random and self._shuffled:
self._shuffled.remove(tl_track) self._shuffled.remove(tl_track)
def mark_played(self, tl_track):
if not self.consume:
return False
self.remove(tlid=tl_track.tlid)
return True
def _trigger_tracklist_changed(self): def _trigger_tracklist_changed(self):
self._first_shuffle = True self._first_shuffle = True
self._shuffled = [] self._shuffled = []