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

audio: Revert MMS related changes.

Browse Source 
This reverts commit 74cf673171.
"audio: Wait for state change instead of async done in scanner."

This reverts commit 4adea37e97.
"audio: Give up getting duration for MMS (Fixes: #1553)"
This commit is contained in:
Thomas Adamcik 2016-10-26 22:41:37 +02:00
parent bbeb5c03aa
commit 7ecc6e5af7
2 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changelog.rst
View File

@ -40,7 +40,7 @@ Feature release.
- Audio: Fix handling of MMS (and any other streams) that can't switch to - Audio: Fix handling of MMS (and any other streams) that can't switch to
playing ``ASYNC``. Previously we would time out trying to get a duration from playing ``ASYNC``. Previously we would time out trying to get a duration from
these. (Fixes: :issue:`1553`, PR :issue:`1575`, :issue:`1576`) these. (Fixes: :issue:`1553`, PR :issue:`1575`)
v2.0.1 (2016-08-16) v2.0.1 (2016-08-16)

39
mopidy/audio/scan.py
View File

@ -194,14 +194,13 @@ def _process(pipeline, timeout_ms):
missing_message = None missing_message = None
duration = None duration = None
# TODO: Turn this into a callback table to cleanup code.
types = ( types = (
Gst.MessageType.APPLICATION |
Gst.MessageType.DURATION_CHANGED |
Gst.MessageType.ELEMENT | Gst.MessageType.ELEMENT |
Gst.MessageType.EOS | Gst.MessageType.APPLICATION |
Gst.MessageType.ERROR | Gst.MessageType.ERROR |
Gst.MessageType.STATE_CHANGED | Gst.MessageType.EOS |
Gst.MessageType.ASYNC_DONE |
Gst.MessageType.DURATION_CHANGED |
Gst.MessageType.TAG Gst.MessageType.TAG
) )
@ -236,25 +235,19 @@ def _process(pipeline, timeout_ms):
raise exceptions.ScannerError(error) raise exceptions.ScannerError(error)
elif msg.type == Gst.MessageType.EOS: elif msg.type == Gst.MessageType.EOS:
return tags, mime, have_audio, duration return tags, mime, have_audio, duration
elif msg.type == Gst.MessageType.STATE_CHANGED and msg.src == pipeline: elif msg.type == Gst.MessageType.ASYNC_DONE:
old_state, new_state, pending = msg.parse_state_changed() success, duration = _query_duration(pipeline)
if tags and success:
return tags, mime, have_audio, duration
if pending == Gst.State.VOID_PENDING: # Workaround for upstream bug which causes tags/duration to arrive
success, duration = _query_duration(pipeline) # after pre-roll. We get around this by starting to play the track
if tags and success: # and then waiting for a duration change.
return tags, mime, have_audio, duration # https://bugzilla.gnome.org/show_bug.cgi?id=763553
logger.debug('Using workaround for duration missing before play.')
if new_state == Gst.State.PAUSED: result = pipeline.set_state(Gst.State.PLAYING)
# Workaround for upstream bug which causes tags/duration to if result == Gst.StateChangeReturn.FAILURE:
# arrive after pre-roll. We get around this by starting to return tags, mime, have_audio, duration
# play the track and then waiting for a duration change.
# https://bugzilla.gnome.org/show_bug.cgi?id=763553
logger.debug('Using workaround for duration missing.')
result = pipeline.set_state(Gst.State.PLAYING)
if result == Gst.StateChangeReturn.FAILURE:
return tags, mime, have_audio, duration
else:
return tags, mime, have_audio, duration
elif msg.type == Gst.MessageType.DURATION_CHANGED: elif msg.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