core: Remove clear_current_track argument from stop()
This commit is contained in:
parent
508391cf51
commit
d5de898b2d
@ -8,6 +8,12 @@ This changelog is used to track all major changes to Mopidy.
|
|||||||
v0.20.0 (UNRELEASED)
|
v0.20.0 (UNRELEASED)
|
||||||
====================
|
====================
|
||||||
|
|
||||||
|
**Core API**
|
||||||
|
|
||||||
|
- Removed ``clear_current_track`` keyword argument to
|
||||||
|
:meth:`mopidy.core.Playback.stop`. It was a leaky internal abstraction,
|
||||||
|
which was never intended to be used externally.
|
||||||
|
|
||||||
**Commands**
|
**Commands**
|
||||||
|
|
||||||
- Make the ``mopidy`` command print a friendly error message if the
|
- Make the ``mopidy`` command print a friendly error message if the
|
||||||
|
|||||||
@ -163,7 +163,8 @@ class PlaybackController(object):
|
|||||||
if next_tl_track:
|
if next_tl_track:
|
||||||
self.change_track(next_tl_track)
|
self.change_track(next_tl_track)
|
||||||
else:
|
else:
|
||||||
self.stop(clear_current_track=True)
|
self.stop()
|
||||||
|
self.current_tl_track = None
|
||||||
|
|
||||||
self.core.tracklist.mark_played(original_tl_track)
|
self.core.tracklist.mark_played(original_tl_track)
|
||||||
|
|
||||||
@ -174,7 +175,8 @@ class PlaybackController(object):
|
|||||||
Used by :class:`mopidy.core.TracklistController`.
|
Used by :class:`mopidy.core.TracklistController`.
|
||||||
"""
|
"""
|
||||||
if self.current_tl_track not in self.core.tracklist.tl_tracks:
|
if self.current_tl_track not in self.core.tracklist.tl_tracks:
|
||||||
self.stop(clear_current_track=True)
|
self.stop()
|
||||||
|
self.current_tl_track = None
|
||||||
|
|
||||||
def next(self):
|
def next(self):
|
||||||
"""
|
"""
|
||||||
@ -190,7 +192,8 @@ class PlaybackController(object):
|
|||||||
# wait for state change?
|
# wait for state change?
|
||||||
self.change_track(tl_track)
|
self.change_track(tl_track)
|
||||||
else:
|
else:
|
||||||
self.stop(clear_current_track=True)
|
self.stop()
|
||||||
|
self.current_tl_track = None
|
||||||
|
|
||||||
def pause(self):
|
def pause(self):
|
||||||
"""Pause playback."""
|
"""Pause playback."""
|
||||||
@ -315,22 +318,14 @@ class PlaybackController(object):
|
|||||||
self._trigger_seeked(time_position)
|
self._trigger_seeked(time_position)
|
||||||
return success
|
return success
|
||||||
|
|
||||||
def stop(self, clear_current_track=False):
|
def stop(self):
|
||||||
"""
|
"""Stop playing."""
|
||||||
Stop playing.
|
|
||||||
|
|
||||||
:param clear_current_track: whether to clear the current track _after_
|
|
||||||
stopping
|
|
||||||
:type clear_current_track: boolean
|
|
||||||
"""
|
|
||||||
if self.state != PlaybackState.STOPPED:
|
if self.state != PlaybackState.STOPPED:
|
||||||
backend = self._get_backend()
|
backend = self._get_backend()
|
||||||
time_position_before_stop = self.time_position
|
time_position_before_stop = self.time_position
|
||||||
if not backend or backend.playback.stop().get():
|
if not backend or backend.playback.stop().get():
|
||||||
self.state = PlaybackState.STOPPED
|
self.state = PlaybackState.STOPPED
|
||||||
self._trigger_track_playback_ended(time_position_before_stop)
|
self._trigger_track_playback_ended(time_position_before_stop)
|
||||||
if clear_current_track:
|
|
||||||
self.current_tl_track = None
|
|
||||||
|
|
||||||
def _trigger_track_playback_paused(self):
|
def _trigger_track_playback_paused(self):
|
||||||
logger.debug('Triggering track playback paused event')
|
logger.debug('Triggering track playback paused event')
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user