mirrors/ympd
1
0
Fork 0
mirror of https://github.com/SuperBFG7/ympd synced 2024-12-23 01:20:27 +00:00
Code Issues Releases Wiki Activity

Merge pull request #69 from kurt-vd/master

Browse Source 
add support for output enable/disable
This commit is contained in:
Andy 2015-09-20 15:56:10 +02:00
commit 30b0b812f6
4 changed files with 94 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/index.html
View File

@ -141,6 +141,8 @@
<span class="glyphicon glyphicon-repeat"></span> Repeat
</button>
</div>
<div id="btn-outputs-block" class="btn-group-vertical btn-block btn-group-lg">
</div>
<div id="btn-responsive-block" class="btn-group-vertical btn-block btn-group-lg">
<button type="button" class="btn btn-default" onclick="updateDB();">

27
htdocs/js/mpd.js
View File

@ -18,6 +18,7 @@
var socket;
var last_state;
var last_outputs;
var current_app;
var pagination = 0;
var browsepath;
@ -147,6 +148,8 @@ function webSocketConnect() {
}).show();
app.run();
/* emit initial request for output names */
socket.send("MPD_API_GET_OUTPUTS");
}
socket.onmessage = function got_packet(msg) {
@ -358,6 +361,26 @@ function webSocketConnect() {
last_state = obj;
break;
case "outputnames":
$('#btn-outputs-block button').remove();
$.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'));
});
/* remove cache, since the buttons have been recreated */
last_outputs = '';
break;
case "outputs":
if(JSON.stringify(obj) === JSON.stringify(last_outputs))
break;
$.each(obj.data, function(id, enabled){
if (enabled)
$('#btnoutput'+id).addClass("active");
else
$('#btnoutput'+id).removeClass("active");
});
last_outputs = obj;
break;
case "disconnected":
if($('.top-right').has('div').length == 0)
$('.top-right').notify({
@ -521,6 +544,10 @@ $('#btnrepeat').on('click', function (e) {
socket.send("MPD_API_TOGGLE_REPEAT," + ($(this).hasClass('active') ? 0 : 1));
});
function toggleoutput(button, id) {
socket.send("MPD_API_TOGGLE_OUTPUT,"+id+"," + ($(button).hasClass('active') ? 0 : 1));
}
$('#btnnotify').on('click', function (e) {
if($.cookie("notification") === "true") {
$.cookie("notification", false);

62
src/mpd_client.c
View File

@ -27,6 +27,9 @@
#include "config.h"
#include "json_encode.h"
/* forward declaration */
static int mpd_notify_callback(struct mg_connection *c, enum mg_event ev);
const char * mpd_cmd_strs[] = {
MPD_CMDS(GEN_STR)
};
@ -106,6 +109,19 @@ int callback_mpd(struct mg_connection *c)
if(sscanf(c->content, "MPD_API_TOGGLE_CROSSFADE,%u", &uint_buf))
mpd_run_crossfade(mpd.conn, uint_buf);
break;
case MPD_API_GET_OUTPUTS:
mpd.buf_size = mpd_put_outputs(mpd.buf, 1);
c->callback_param = NULL;
mpd_notify_callback(c, MG_POLL);
break;
case MPD_API_TOGGLE_OUTPUT:
if (sscanf(c->content, "MPD_API_TOGGLE_OUTPUT,%u,%u", &uint_buf, &uint_buf_2)) {
if (uint_buf_2)
mpd_run_enable_output(mpd.conn, uint_buf);
else
mpd_run_disable_output(mpd.conn, uint_buf);
}
break;
case MPD_API_SET_VOLUME:
if(sscanf(c->content, "MPD_API_SET_VOLUME,%ud", &uint_buf) && uint_buf <= 100)
mpd_run_set_volume(mpd.conn, uint_buf);
@ -351,6 +367,13 @@ void mpd_poll(struct mg_server *s)
fprintf(stderr, "MPD connected.\n");
mpd_connection_set_timeout(mpd.conn, 10000);
mpd.conn_state = MPD_CONNECTED;
/* write outputs */
mpd.buf_size = mpd_put_outputs(mpd.buf, 1);
for (struct mg_connection *c = mg_next(s, NULL); c != NULL; c = mg_next(s, c))
{
c->callback_param = NULL;
mpd_notify_callback(c, MG_POLL);
}
break;
case MPD_FAILURE:
@ -371,6 +394,12 @@ void mpd_poll(struct mg_server *s)
c->callback_param = NULL;
mpd_notify_callback(c, MG_POLL);
}
mpd.buf_size = mpd_put_outputs(mpd.buf, 0);
for (struct mg_connection *c = mg_next(s, NULL); c != NULL; c = mg_next(s, c))
{
c->callback_param = NULL;
mpd_notify_callback(c, MG_POLL);
}
break;
}
}
@ -424,6 +453,39 @@ int mpd_put_state(char *buffer, int *current_song_id, unsigned *queue_version)
return len;
}
int mpd_put_outputs(char *buffer, int names)
{
struct mpd_output *out;
int nout;
char *str, *strend;
str = buffer;
strend = buffer+MAX_SIZE;
str += snprintf(str, strend-str, "{\"type\":\"%s\", \"data\":{",
names ? "outputnames" : "outputs");
mpd_send_outputs(mpd.conn);
nout = 0;
while ((out = mpd_recv_output(mpd.conn)) != NULL) {
if (nout++)
*str++ = ',';
if (names)
str += snprintf(str, strend - str, " \"%d\":\"%s\"",
mpd_output_get_id(out), mpd_output_get_name(out));
else
str += snprintf(str, strend-str, " \"%d\":%d",
mpd_output_get_id(out), mpd_output_get_enabled(out));
mpd_output_free(out);
}
if (!mpd_response_finish(mpd.conn)) {
fprintf(stderr, "MPD outputs: %s\n", mpd_connection_get_error_message(mpd.conn));
mpd_connection_clear_error(mpd.conn);
return 0;
}
str += snprintf(str, strend-str, " }}");
return str-buffer;
}
int mpd_put_current_song(char *buffer)
{
char *cur = buffer;

3
src/mpd_client.h
View File

@ -58,6 +58,8 @@
X(MPD_API_SET_MPDHOST) \
X(MPD_API_SET_MPDPASS) \
X(MPD_API_UPDATE_DB) \
X(MPD_API_GET_OUTPUTS) \
X(MPD_API_TOGGLE_OUTPUT) \
X(MPD_API_TOGGLE_RANDOM) \
X(MPD_API_TOGGLE_CONSUME) \
X(MPD_API_TOGGLE_SINGLE) \
@ -101,6 +103,7 @@ void mpd_poll(struct mg_server *s);
int callback_mpd(struct mg_connection *c);
int mpd_close_handler(struct mg_connection *c);
int mpd_put_state(char *buffer, int *current_song_id, unsigned *queue_version);
int mpd_put_outputs(char *buffer, int putnames);
int mpd_put_current_song(char *buffer);
int mpd_put_queue(char *buffer, unsigned int offset);
int mpd_put_browse(char *buffer, char *path, unsigned int offset);