From d4ed52ac32dde2c8f83765a69f25c50a9ed65178 Mon Sep 17 00:00:00 2001 From: jcass Date: Tue, 26 Jan 2016 16:29:56 +0200 Subject: [PATCH] Use standard mixer controls to mute / un-mute. --- .../static/js/controls.js | 20 ++++++++----------- mopidy_musicbox_webclient/static/mb.manifest | 2 +- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js index 6f4ba71..4db98f1 100644 --- a/mopidy_musicbox_webclient/static/js/controls.js +++ b/mopidy_musicbox_webclient/static/js/controls.js @@ -410,11 +410,6 @@ function setPosition(pos) { function setVolume(value) { if (value != currentVolume) { $("#volumeslider").val(value).slider('refresh'); - if (value > 0) { - $("#mutebt").attr('class', 'fa fa-volume-off'); - } else { - $("#mutebt").attr('class', 'fa fa-volume-up'); - } } } @@ -432,13 +427,14 @@ function triggerVolume() { function doMute() { //only emit the event, not the status - if (currentVolume > 0) { - muteVolume = currentVolume - setVolume(0); - } else { - setVolume(muteVolume); - muteVolume = -1; - } + mopidy.mixer.getMute().then(function(mute) { + mopidy.mixer.setMute(!mute).then(); + if (!mute) { + $("#mutebt").attr('class', 'fa fa-volume-up'); + } else { + $("#mutebt").attr('class', 'fa fa-volume-off'); + } + }); } /******* diff --git a/mopidy_musicbox_webclient/static/mb.manifest b/mopidy_musicbox_webclient/static/mb.manifest index f2c16ab..551f7f1 100644 --- a/mopidy_musicbox_webclient/static/mb.manifest +++ b/mopidy_musicbox_webclient/static/mb.manifest @@ -1,6 +1,6 @@ CACHE MANIFEST -# 2016-01-25:v1 +# 2016-01-26:v1 CACHE: index.html