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

audio: Never run about-to-finish from audio actor

Browse Source
This commit is contained in:
Thomas Adamcik 2015-10-07 22:59:57 +02:00
parent efeac2dba8
commit a9a2cdcb9d
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mopidy/audio/actor.py
View File

@ -2,6 +2,7 @@ from __future__ import absolute_import, unicode_literals
import logging import logging
import os import os
import threading
import gobject import gobject
@ -406,6 +407,7 @@ class Audio(pykka.ThreadingActor):
self.mixer = SoftwareMixer(mixer) self.mixer = SoftwareMixer(mixer)
def on_start(self): def on_start(self):
self._thread = threading.current_thread()
try: try:
self._setup_preferences() self._setup_preferences()
self._setup_playbin() self._setup_playbin()
@ -499,6 +501,11 @@ class Audio(pykka.ThreadingActor):
self.mixer.teardown() self.mixer.teardown()
def _on_about_to_finish(self, element): def _on_about_to_finish(self, element):
if self._thread == threading.current_thread():
logger.error(
'about-to-finish in actor, aborting to avoid deadlock.')
return
gst_logger.debug('Got about-to-finish event.') gst_logger.debug('Got about-to-finish event.')
if self._about_to_finish_callback: if self._about_to_finish_callback:
logger.debug('Running about to finish callback.') logger.debug('Running about to finish callback.')