From 3f699b97d29efc5d0a7f14d173d155c68b898cee Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Sun, 7 Sep 2014 22:35:58 +0200 Subject: [PATCH] audio: Split message/event teardown handler --- mopidy/audio/actor.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mopidy/audio/actor.py b/mopidy/audio/actor.py index 8b77ee65..9db6fbf5 100644 --- a/mopidy/audio/actor.py +++ b/mopidy/audio/actor.py @@ -279,13 +279,14 @@ class _Handler(object): self._pad = pad self._event_handler_id = pad.add_event_probe(self.on_event) - def teardown(self): + def teardown_message_handling(self): bus = self._element.get_bus() bus.remove_signal_watch() bus.disconnect(self._message_handler_id) - self._pad.remove_event_probe(self._event_handler_id) - self._message_handler_id = None + + def teardown_event_handling(self): + self._pad.remove_event_probe(self._event_handler_id) self._event_handler_id = None def on_message(self, bus, msg): @@ -478,7 +479,8 @@ class Audio(pykka.ThreadingActor): self._handler.setup_message_handling(playbin) def _teardown_playbin(self): - self._handler.teardown() + self._handler.teardown_message_handling() + self._handler.teardown_event_handling() self._signals.disconnect(self._playbin, 'about-to-finish') self._signals.disconnect(self._playbin, 'source-setup') self._playbin.set_state(gst.STATE_NULL)