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

audio: Cleanup the signals we connect in the scanner

Browse Source 
Without this fix we simply crash due to using up all the available FDs on the
system.
This commit is contained in:
Thomas Adamcik 2015-12-17 22:14:39 +01:00 committed by Stein Magnus Jodal
parent b3aeb9b508
commit ded059b5c9
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mopidy/audio/scan.py
View File

@ -61,7 +61,7 @@ class Scanner(object):
""" """
timeout = int(timeout or self._timeout_ms) timeout = int(timeout or self._timeout_ms)
tags, duration, seekable, mime = None, None, None, None tags, duration, seekable, mime = None, None, None, None
pipeline = _setup_pipeline(uri, self._proxy_config) pipeline, signals = _setup_pipeline(uri, self._proxy_config)
try: try:
_start_pipeline(pipeline) _start_pipeline(pipeline)
@ -69,6 +69,7 @@ class Scanner(object):
duration = _query_duration(pipeline) duration = _query_duration(pipeline)
seekable = _query_seekable(pipeline) seekable = _query_seekable(pipeline)
finally: finally:
signals.clear()
pipeline.set_state(Gst.State.NULL) pipeline.set_state(Gst.State.NULL)
del pipeline del pipeline
@ -94,11 +95,12 @@ def _setup_pipeline(uri, proxy_config=None):
if proxy_config: if proxy_config:
utils.setup_proxy(src, proxy_config) utils.setup_proxy(src, proxy_config)
typefind.connect('have-type', _have_type, decodebin) signals = utils.Signals()
decodebin.connect('pad-added', _pad_added, pipeline) signals.connect(typefind, 'have-type', _have_type, decodebin)
decodebin.connect('autoplug-select', _autoplug_select) signals.connect(decodebin, 'pad-added', _pad_added, pipeline)
signals.connect(decodebin, 'autoplug-select', _autoplug_select)
return pipeline return pipeline, signals
def _have_type(element, probability, caps, decodebin): def _have_type(element, probability, caps, decodebin):