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

Merge branch 'develop'

Browse Source
This commit is contained in:
woutervanwijk 2013-12-28 16:35:17 +01:00
commit bfd77290f1
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
flatclient/js/controls.js vendored
View File

@ -264,22 +264,38 @@ function setRandom(nwrandom) {
function doRandom() { function doRandom() {
if (random == false) { if (random == false) {
// mopidy.tracklist.setRandom(true).then(); //check for mopidy 0.16.x or higher
mopidy.playback.setRandom(true).then(); if (mopidy.tracklist.setRandom) {
mopidy.tracklist.setRandom(true).then();
} else {
mopidy.playback.setRandom(true).then();
}
} else { } else {
//mopidy.tracklist.setRandom(false).then(); //check for mopidy 0.16.x or higher
mopidy.playback.setRandom(false).then(); if (mopidy.tracklist.setRandom) {
mopidy.tracklist.setRandom(false).then();
} else {
mopidy.playback.setRandom(false).then();
}
} }
setRandom(!random); setRandom(!random);
} }
function doRepeat() { function doRepeat() {
if (repeat == false) { if (repeat == false) {
//mopidy.tracklist.setRepeat(true).then(); //check for mopidy 0.16.x or higher
mopidy.playback.setRepeat(true).then(); if (mopidy.tracklist.setRepeat) {
mopidy.tracklist.setRepeat(true).then();
} else {
mopidy.playback.setRepeat(true).then();
}
} else { } else {
//mopidy.tracklist.setRepeat(false).then(); //check for mopidy 0.16.x or higher
mopidy.playback.setRepeat(false).then(); if (mopidy.tracklist.setRepeat) {
mopidy.tracklist.setRepeat(false).then();
} else {
mopidy.playback.setRepeat(false).then();
}
} }
setRepeat(!repeat); setRepeat(!repeat);
} }

13
flatclient/js/gui.js
View File

@ -380,11 +380,14 @@ function updateStatusOfAll() {
mopidy.playback.getTimePosition().then(processCurrentposition, console.error); mopidy.playback.getTimePosition().then(processCurrentposition, console.error);
mopidy.playback.getState().then(processPlaystate, console.error); mopidy.playback.getState().then(processPlaystate, console.error);
// mopidy.tracklist.getRepeat().then(processRepeat, console.error); //check for mopidy 0.16 and higher
// mopidy.tracklist.getRandom().then(processRandom, console.error); if (mopidy.tracklist.getRepeat) {
mopidy.tracklist.getRepeat().then(processRepeat, console.error);
mopidy.playback.getRepeat().then(processRepeat, console.error); mopidy.tracklist.getRandom().then(processRandom, console.error);
mopidy.playback.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); mopidy.playback.getVolume().then(processVolume, console.error);
} }