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

audio: Fix scan timeout handling

Browse Source
This commit is contained in:
Thomas Adamcik 2015-08-16 12:06:14 +02:00
parent 43e66891bd
commit 087ee42882
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changelog.rst
View File

@ -21,6 +21,9 @@ Bug fix release.
with a limited set of environment variables. (Fixes: :issue:`1249`, PR:
:issue:`1255`)
- Audio: Fix timeout handling in scanner. This regression caused timeouts to
expire before it should, causing scans to fail.
v1.1.0 (2015-08-09)
===================

6
mopidy/audio/scan.py
View File

@ -139,7 +139,7 @@ def _process(pipeline, timeout_ms):
types = (gst.MESSAGE_ELEMENT | gst.MESSAGE_APPLICATION | gst.MESSAGE_ERROR
| gst.MESSAGE_EOS | gst.MESSAGE_ASYNC_DONE | gst.MESSAGE_TAG)
start = clock.get_time()
previous = clock.get_time()
while timeout > 0:
message = bus.timed_pop_filtered(timeout, types)
@ -171,7 +171,9 @@ def _process(pipeline, timeout_ms):
# Note that this will only keep the last tag.
tags.update(utils.convert_taglist(taglist))
timeout -= clock.get_time() - start
now = clock.get_time()
timeout -= now - previous
previous = now
raise exceptions.ScannerError('Timeout after %dms' % timeout_ms)