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

audio: Postpone tags until after stream-start

Browse Source 
When a new URI gets set we create a pending tags dictionary. This gets all the
tags until stream-start, at which point they are all emitted at once. During
track playback tags works as before.

This ensure we don't prematurely tell clients about metadata changes.
This commit is contained in:
Thomas Adamcik 2016-02-13 22:44:31 +01:00
parent c23cad5d13
commit b63b3c288a
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mopidy/audio/actor.py
View File

@ -327,6 +327,11 @@ class _Handler(object):
tags = tags_lib.convert_taglist(taglist) tags = tags_lib.convert_taglist(taglist)
gst_logger.debug('Got TAG bus message: tags=%r', dict(tags)) gst_logger.debug('Got TAG bus message: tags=%r', dict(tags))
# Postpone emitting tags until stream start.
if self._audio._pending_tags is not None:
self._audio._pending_tags.update(tags)
return
# TODO: Add proper tests for only emitting changed tags. # TODO: Add proper tests for only emitting changed tags.
unique = object() unique = object()
changed = [] changed = []
@ -359,6 +364,14 @@ class _Handler(object):
logger.debug('Audio event: stream_changed(uri=%r)', uri) logger.debug('Audio event: stream_changed(uri=%r)', uri)
AudioListener.send('stream_changed', uri=uri) AudioListener.send('stream_changed', uri=uri)
# Emit any postponed tags that we got after about-to-finish.
tags, self._audio._pending_tags = self._audio._pending_tags, None
self._audio._tags = tags
if tags:
logger.debug('Audio event: tags_changed(tags=%r)', tags.keys())
AudioListener.send('tags_changed', tags=tags.keys())
def on_segment(self, segment): def on_segment(self, segment):
gst_logger.debug( gst_logger.debug(
'Got SEGMENT pad event: ' 'Got SEGMENT pad event: '
@ -396,6 +409,7 @@ class Audio(pykka.ThreadingActor):
self._buffering = False self._buffering = False
self._tags = {} self._tags = {}
self._pending_uri = None self._pending_uri = None
self._pending_tags = None
self._playbin = None self._playbin = None
self._outputs = None self._outputs = None
@ -546,8 +560,8 @@ class Audio(pykka.ThreadingActor):
else: else:
current_volume = None current_volume = None
self._tags = {} # TODO: add test for this somehow
self._pending_uri = uri self._pending_uri = uri
self._pending_tags = {}
self._playbin.set_property('uri', uri) self._playbin.set_property('uri', uri)
if self.mixer is not None and current_volume is not None: if self.mixer is not None and current_volume is not None: