From cb4130c2a7c951c12968f7a24f00e9de820f0540 Mon Sep 17 00:00:00 2001 From: Javier Domingo Cansino Date: Thu, 8 Aug 2013 13:45:36 +0200 Subject: [PATCH] core: Moving the trigger activation from one playback to tracklist --- mopidy/core/playback.py | 4 ---- mopidy/core/tracklist.py | 12 ++++++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mopidy/core/playback.py b/mopidy/core/playback.py index 7ec7ff2a..8bdf8fd0 100644 --- a/mopidy/core/playback.py +++ b/mopidy/core/playback.py @@ -330,10 +330,6 @@ class PlaybackController(object): 'playback_state_changed', old_state=old_state, new_state=new_state) - def _trigger_options_changed(self): - logger.debug('Triggering options changed event') - listener.CoreListener.send('options_changed') - def _trigger_volume_changed(self, volume): logger.debug('Triggering volume changed event') listener.CoreListener.send('volume_changed', volume=volume) diff --git a/mopidy/core/tracklist.py b/mopidy/core/tracklist.py index 05f8fa88..3364356b 100644 --- a/mopidy/core/tracklist.py +++ b/mopidy/core/tracklist.py @@ -72,7 +72,7 @@ class TracklistController(object): def set_consume(self, value): if self.get_consume() != value: - self.core.playback._trigger_options_changed() + self._trigger_options_changed() return setattr(self, '_consume', value) consume = property(get_consume, set_consume) @@ -88,7 +88,7 @@ class TracklistController(object): def set_random(self, value): if self.get_random() != value: - self.core.playback._trigger_options_changed() + self._trigger_options_changed() return setattr(self, '_random', value) random = property(get_random, set_random) @@ -104,7 +104,7 @@ class TracklistController(object): def set_repeat(self, value): if self.get_repeat() != value: - self.core.playback._trigger_options_changed() + self._trigger_options_changed() return setattr(self, '_repeat', value) repeat = property(get_repeat, set_repeat) @@ -121,7 +121,7 @@ class TracklistController(object): def set_single(self, value): if self.get_single() != value: - self.core.playback._trigger_options_changed() + self._trigger_options_changed() return setattr(self, '_single', value) single = property(get_single, set_single) @@ -475,3 +475,7 @@ class TracklistController(object): self._shuffled = [] logger.debug('Triggering event: tracklist_changed()') listener.CoreListener.send('tracklist_changed') + + def _trigger_options_changed(self): + logger.debug('Triggering options changed event') + listener.CoreListener.send('options_changed')