From 64cab9ae95444fc96362b1775024647636a697d3 Mon Sep 17 00:00:00 2001
From: Alexandre Petitjean <alpetitjean@gmail.com>
Date: Tue, 20 Jan 2015 21:50:02 +0100
Subject: [PATCH] Rename current_md_track to current_metadata_track

---
 mopidy/core/actor.py                    | 4 ++--
 mopidy/core/playback.py                 | 4 ++--
 mopidy/mpd/protocol/current_playlist.py | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mopidy/core/actor.py b/mopidy/core/actor.py
index 60de442a..ff60f190 100644
--- a/mopidy/core/actor.py
+++ b/mopidy/core/actor.py
@@ -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)})
 
diff --git a/mopidy/core/playback.py b/mopidy/core/playback.py
index ad99e6ec..2bc2fbe6 100644
--- a/mopidy/core/playback.py
+++ b/mopidy/core/playback.py
@@ -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`.
diff --git a/mopidy/mpd/protocol/current_playlist.py b/mopidy/mpd/protocol/current_playlist.py
index bc89afcb..e083ea7c 100644
--- a/mopidy/mpd/protocol/current_playlist.py
+++ b/mopidy/mpd/protocol/current_playlist.py
@@ -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