From 211ff535ed09ef247e40fb9f5e25f3b139fb3e94 Mon Sep 17 00:00:00 2001
From: woutervanwijk <wouter@iMac-3.local>
Date: Sat, 28 Dec 2013 16:35:08 +0100
Subject: [PATCH] quick fix (and check) for 0.16 and higher

---
 flatclient/js/controls.js | 32 ++++++++++++++++++++++++--------
 flatclient/js/gui.js      | 13 ++++++++-----
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/flatclient/js/controls.js b/flatclient/js/controls.js
index 3f1baff..6662bb1 100755
--- a/flatclient/js/controls.js
+++ b/flatclient/js/controls.js
@@ -264,22 +264,38 @@ function setRandom(nwrandom) {
 
 function doRandom() {
     if (random == false) {
-//	mopidy.tracklist.setRandom(true).then();
-        mopidy.playback.setRandom(true).then();
+	//check for mopidy 0.16.x or higher
+	if (mopidy.tracklist.setRandom) { 
+		mopidy.tracklist.setRandom(true).then();
+	} else {
+            mopidy.playback.setRandom(true).then();
+        }
     } else {
-        //mopidy.tracklist.setRandom(false).then();
-        mopidy.playback.setRandom(false).then();
+	//check for mopidy 0.16.x or higher
+	if (mopidy.tracklist.setRandom) { 
+		mopidy.tracklist.setRandom(false).then();
+	} else {
+            mopidy.playback.setRandom(false).then();
+        }
     }
     setRandom(!random);
 }
 
 function doRepeat() {
     if (repeat == false) {
-        //mopidy.tracklist.setRepeat(true).then();
-        mopidy.playback.setRepeat(true).then();
+	//check for mopidy 0.16.x or higher
+	if (mopidy.tracklist.setRepeat) { 
+            mopidy.tracklist.setRepeat(true).then();
+        } else {
+    	    mopidy.playback.setRepeat(true).then();
+    	}
     } else {
-        //mopidy.tracklist.setRepeat(false).then();
-        mopidy.playback.setRepeat(false).then();
+	//check for mopidy 0.16.x or higher
+	if (mopidy.tracklist.setRepeat) { 
+            mopidy.tracklist.setRepeat(false).then();
+        } else {
+    	    mopidy.playback.setRepeat(false).then();
+    	}
     }
     setRepeat(!repeat);
 }
diff --git a/flatclient/js/gui.js b/flatclient/js/gui.js
index 6d63b78..2e2283f 100755
--- a/flatclient/js/gui.js
+++ b/flatclient/js/gui.js
@@ -380,11 +380,14 @@ function updateStatusOfAll() {
     mopidy.playback.getTimePosition().then(processCurrentposition, console.error);
     mopidy.playback.getState().then(processPlaystate, console.error);
 
-//    mopidy.tracklist.getRepeat().then(processRepeat, console.error);
-//    mopidy.tracklist.getRandom().then(processRandom, console.error);
-
-    mopidy.playback.getRepeat().then(processRepeat, console.error);
-    mopidy.playback.getRandom().then(processRandom, console.error);
+    //check for mopidy 0.16 and higher
+    if (mopidy.tracklist.getRepeat) {
+	mopidy.tracklist.getRepeat().then(processRepeat, console.error);
+        mopidy.tracklist.getRandom().then(processRandom, console.error);
+    } else {
+        mopidy.playback.getRepeat().then(processRepeat, console.error);
+	mopidy.playback.getRandom().then(processRandom, console.error);
+    }
 
     mopidy.playback.getVolume().then(processVolume, console.error);
 }