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

Rename current_md_track to current_metadata_track

Browse Source
This commit is contained in:
Alexandre Petitjean 2015-01-20 21:50:02 +01:00
parent ef950a5e15
commit 64cab9ae95
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mopidy/core/actor.py
View File

@ -120,14 +120,14 @@ class Core(
# Request available metadata and set a track
mt_track = convert_tags_to_track(tags)
# Merge current_tl_track with metadata in current_md_track
# Merge current_tl_track with metadata in current_metadata_track
c_track = self.playback.current_tl_track.track
track_kwargs = {k: v for k, v in c_track.__dict__.items() if v}
for k, v in mt_track.__dict__.items():
if v:
track_kwargs[k] = v
self.playback.current_md_track = TlTrack(**{
self.playback.current_metadata_track = TlTrack(**{
'tlid': self.playback.current_tl_track.tlid,
'track': Track(**track_kwargs)})

4
mopidy/core/playback.py
View File

@ -127,9 +127,9 @@ class PlaybackController(object):
"""Mute state as a :class:`True` if muted, :class:`False` otherwise"""
def get_current_metadata_track(self):
return self.current_md_track
return self.current_metadata_track
current_md_track = None
current_metadata_track = None
"""
The currently playing metadata :class:`mopidy.models.Track`,
or :class:`None`.

2
mopidy/mpd/protocol/current_playlist.py
View File

@ -283,7 +283,7 @@ def plchanges(context, version):
elif iversion == tracklist_version:
# If version are equals, it is just a metadata update
# So we replace the updated track in playlist
current_md_track = context.core.playback.current_md_track.get()
current_md_track = context.core.playback.current_metadata_track.get()
if current_md_track is None:
return None