From 7af570418f3966b9678e6c1b0444a3f9097a943b Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <thomas@adamcik.no>
Date: Sat, 18 Apr 2015 23:05:50 +0200
Subject: [PATCH] mpd: Stop using properties to get values

---
 mopidy/mpd/protocol/playback.py |  8 ++++----
 mopidy/mpd/protocol/status.py   | 25 +++++++++++++------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/mopidy/mpd/protocol/playback.py b/mopidy/mpd/protocol/playback.py
index a537819c..26890d10 100644
--- a/mopidy/mpd/protocol/playback.py
+++ b/mopidy/mpd/protocol/playback.py
@@ -16,7 +16,7 @@ def consume(context, state):
         1. When consume is activated, each song played is removed from
         playlist.
     """
-    context.core.tracklist.consume = state
+    context.core.tracklist.set_consume(state)
 
 
 @protocol.commands.add('crossfade', seconds=protocol.UINT)
@@ -279,7 +279,7 @@ def random(context, state):
 
         Sets random state to ``STATE``, ``STATE`` should be 0 or 1.
     """
-    context.core.tracklist.random = state
+    context.core.tracklist.set_random(state)
 
 
 @protocol.commands.add('repeat', state=protocol.BOOL)
@@ -291,7 +291,7 @@ def repeat(context, state):
 
         Sets repeat state to ``STATE``, ``STATE`` should be 0 or 1.
     """
-    context.core.tracklist.repeat = state
+    context.core.tracklist.set_repeat(state)
 
 
 @protocol.commands.add('replay_gain_mode')
@@ -409,7 +409,7 @@ def single(context, state):
         single is activated, playback is stopped after current song, or
         song is repeated if the ``repeat`` mode is enabled.
     """
-    context.core.tracklist.single = state
+    context.core.tracklist.set_single(state)
 
 
 @protocol.commands.add('stop')
diff --git a/mopidy/mpd/protocol/status.py b/mopidy/mpd/protocol/status.py
index aa78b387..9e7c5180 100644
--- a/mopidy/mpd/protocol/status.py
+++ b/mopidy/mpd/protocol/status.py
@@ -172,20 +172,20 @@ def status(context):
         - ``elapsed``: Higher resolution means time in seconds with three
           decimal places for millisecond precision.
     """
+    tl_track = context.core.playback.get_current_tl_track()
+
     futures = {
-        'tracklist.length': context.core.tracklist.length,
-        'tracklist.version': context.core.tracklist.version,
+        'tracklist.length': context.core.tracklist.get_length(),
+        'tracklist.version': context.core.tracklist.get_version(),
         'mixer.volume': context.core.mixer.get_volume(),
-        'tracklist.consume': context.core.tracklist.consume,
-        'tracklist.random': context.core.tracklist.random,
-        'tracklist.repeat': context.core.tracklist.repeat,
-        'tracklist.single': context.core.tracklist.single,
-        'playback.state': context.core.playback.state,
-        'playback.current_tl_track': context.core.playback.current_tl_track,
-        'tracklist.index': (
-            context.core.tracklist.index(
-                context.core.playback.current_tl_track.get())),
-        'playback.time_position': context.core.playback.time_position,
+        'tracklist.consume': context.core.tracklist.get_consume(),
+        'tracklist.random': context.core.tracklist.get_random(),
+        'tracklist.repeat': context.core.tracklist.get_repeat(),
+        'tracklist.single': context.core.tracklist.get_single(),
+        'playback.state': context.core.playback.get_state(),
+        'playback.current_tl_track': tl_track,
+        'tracklist.index': context.core.tracklist.index(tl_track.get()),
+        'playback.time_position': context.core.playback.get_time_position(),
     }
     pykka.get_all(futures.values())
     result = [
@@ -199,6 +199,7 @@ def status(context):
         ('xfade', _status_xfade(futures)),
         ('state', _status_state(futures)),
     ]
+    # TODO: add nextsong and nextsongid
     if futures['playback.current_tl_track'].get() is not None:
         result.append(('song', _status_songpos(futures)))
         result.append(('songid', _status_songid(futures)))