Skip to content

Fix outputnames #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
embhd wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix outputnames #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d9b27c
Fix display of output buttons
embhd Apr 7, 2018
7a3bc0c
Removed default DIRBLE_API_TOKEN from two init scripts
embhd Apr 7, 2018
de4878b
Changed variable name
embhd Apr 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/ympd.default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ MPD_PORT=6600
MPD_PASSWORD=
WEB_PORT=8080
YMPD_USER=nobody
DIRBLE_API_TOKEN=2e223c9909593b94fc6577361a
DIRBLE_API_TOKEN=
2 changes: 1 addition & 1 deletion contrib/ympd.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Environment=MPD_PORT=6600
Environment=MPD_PASSWORD=
Environment=WEB_PORT=8080
Environment=YMPD_USER=nobody
Environment=DIRBLE_API_TOKEN=2e223c9909593b94fc6577361a
Environment=DIRBLE_API_TOKEN=
EnvironmentFile=/etc/default/ympd
ExecStart=/usr/bin/ympd --user $YMPD_USER --mpdpass "$MPD_PASSWORD" --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT --dirbletoken $DIRBLE_API_TOKEN
Type=simple
Expand Down
17 changes: 9 additions & 8 deletions htdocs/js/mpd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,14 +493,15 @@ function webSocketConnect() {
break;
case 'outputnames':
$('#btn-outputs-block button').remove();
if (obj.data.length > 1) {
$.each(obj.data, function(id, name){
var btn = $('<button id="btnoutput'+id+'" class="btn btn-default" onclick="toggleoutput(this, '+id+')"><span class="glyphicon glyphicon-volume-up"></span> '+name+'</button>');
btn.appendTo($('#btn-outputs-block'));
});
} else {
$('#btn-outputs-block').addClass('hide');
}
var num_outputs = 0;
$.each(obj.data, function(id, name){
var btn = $('<button id="btnoutput' + id +
'" class="btn btn-default" onclick="toggleoutput(this, ' + id + ')">' +
'<span class="glyphicon glyphicon-volume-up"></span> ' + name + '</button>');
btn.appendTo($('#btn-outputs-block'));
num_outputs++;
});
if (num_outputs == 1) { $('#btn-outputs-block').addClass('hide'); }
/* remove cache, since the buttons have been recreated */
last_outputs = '';
break;
Expand Down