From 0ea4fd6af038f0157fd8554a024a13e9948d6aee Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sat, 19 Oct 2013 20:12:14 +0200 Subject: [PATCH] core.tracklist: Rename mark_{consumed => played} --- mopidy/core/playback.py | 2 +- mopidy/core/tracklist.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mopidy/core/playback.py b/mopidy/core/playback.py index fbbab4e5..a8c1a78a 100644 --- a/mopidy/core/playback.py +++ b/mopidy/core/playback.py @@ -165,7 +165,7 @@ class PlaybackController(object): else: 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): """ diff --git a/mopidy/core/tracklist.py b/mopidy/core/tracklist.py index 33315ac8..100a603f 100644 --- a/mopidy/core/tracklist.py +++ b/mopidy/core/tracklist.py @@ -431,12 +431,6 @@ class TracklistController(object): """ 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): if self.random and tl_track in self._shuffled: self._shuffled.remove(tl_track) @@ -445,6 +439,12 @@ class TracklistController(object): if self.random and self._shuffled: 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): self._first_shuffle = True self._shuffled = []