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

audio: Try and simplify logic for going to playing in scanner

Browse Source
This commit is contained in:
Thomas Adamcik 2016-03-25 15:17:02 +01:00
parent c972ecd1f2
commit e9137e132a
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mopidy/audio/scan.py
View File

@ -192,14 +192,18 @@ def _process(pipeline, timeout_ms):
duration = duration // Gst.MSECOND duration = duration // Gst.MSECOND
else: else:
duration = None duration = None
if (tags and duration is not None
# workaround for if tags and duration is not None:
# https://bugzilla.gnome.org/show_bug.cgi?id=763553:
# try to start pipeline playing; if it doesn't then
# give up:
) or (pipeline.set_state(Gst.State.PLAYING) ==
Gst.StateChangeReturn.FAILURE):
return tags, mime, have_audio, duration return tags, mime, have_audio, duration
# Workaround for upstream bug which causes tags/duration to arrive
# after pre-roll. We get around this by starting to play the track
# and then waiting for a duration change.
# https://bugzilla.gnome.org/show_bug.cgi?id=763553
result = pipeline.set_state(Gst.State.PLAYING)
if result == Gst.StateChangeReturn.FAILURE:
return tags, mime, have_audio, duration
elif message.type == Gst.MessageType.DURATION_CHANGED: elif message.type == Gst.MessageType.DURATION_CHANGED:
# duration will be read after ASYNC_DONE received; for now # duration will be read after ASYNC_DONE received; for now
# just give it a non-None value to flag that we have a duration: # just give it a non-None value to flag that we have a duration: