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

Merge pull request #674 into release/0.18.2

Browse Source
This commit is contained in:
Stein Magnus Jodal 2014-02-07 00:45:08 +01:00
commit 6ace0c54f9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mopidy/core/playback.py
View File

@ -306,9 +306,10 @@ class PlaybackController(object):
""" """
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
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() self._trigger_track_playback_ended(time_position_before_stop)
if clear_current_track: if clear_current_track:
self.current_tl_track = None self.current_tl_track = None
@ -336,13 +337,14 @@ class PlaybackController(object):
'track_playback_started', 'track_playback_started',
tl_track=self.current_tl_track) tl_track=self.current_tl_track)
def _trigger_track_playback_ended(self): def _trigger_track_playback_ended(self, time_position_before_stop):
logger.debug('Triggering track playback ended event') logger.debug('Triggering track playback ended event')
if self.current_tl_track is None: if self.current_tl_track is None:
return return
listener.CoreListener.send( listener.CoreListener.send(
'track_playback_ended', 'track_playback_ended',
tl_track=self.current_tl_track, time_position=self.time_position) tl_track=self.current_tl_track,
time_position=time_position_before_stop)
def _trigger_playback_state_changed(self, old_state, new_state): def _trigger_playback_state_changed(self, old_state, new_state):
logger.debug('Triggering playback state change event') logger.debug('Triggering playback state change event')