mirrors/ympd
1
0
Fork 0
mirror of https://github.com/SuperBFG7/ympd synced 2025-10-24 18:37:40 +00:00
Code Issues Releases Wiki Activity

Feat: update bootstrap to 4.2.1

Browse Source
This commit is contained in:
jcorporation
2019-02-04 19:28:20 +01:00
parent f322bd1fca
commit 50e5fc9081
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dist/htdocs/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

28
src/mpd_client.c
View File

@@ -1121,6 +1121,7 @@ static void mpd_client_idle(t_config *config, t_mpd_state *mpd_state) {
int pollrc; int pollrc;
char buffer[MAX_SIZE]; char buffer[MAX_SIZE];
size_t len = 0; size_t len = 0;
unsigned mpd_client_queue_length = 0;
switch (mpd_state->conn_state) { switch (mpd_state->conn_state) {
case MPD_DISCONNECTED: case MPD_DISCONNECTED:
@@ -1133,6 +1134,7 @@ static void mpd_client_idle(t_config *config, t_mpd_state *mpd_state) {
mpd_client_notify(buffer, len); mpd_client_notify(buffer, len);
mpd_state->conn_state = MPD_FAILURE; mpd_state->conn_state = MPD_FAILURE;
mpd_connection_free(mpd_state->conn); mpd_connection_free(mpd_state->conn);
sleep(3); sleep(3);
return; return;
} }
@@ -1176,13 +1178,35 @@ static void mpd_client_idle(t_config *config, t_mpd_state *mpd_state) {
} }
mpd_state->conn = NULL; mpd_state->conn = NULL;
mpd_state->conn_state = MPD_DISCONNECTED; mpd_state->conn_state = MPD_DISCONNECTED;
//mpd_client_api error response
mpd_client_queue_length = tiny_queue_length(mpd_client_queue, 50);
if (mpd_client_queue_length > 0) {
//Handle request
LOG_DEBUG() fprintf(stderr, "DEBUG: Handle request (mpd disconnected).\n");
t_work_request *request = tiny_queue_shift(mpd_client_queue, 50);
if (request != NULL) {
//create response struct
t_work_result *response = (t_work_result*)malloc(sizeof(t_work_result));
response->conn_id = request->conn_id;
response->length = 0;
response->length = snprintf(response->data, MAX_SIZE, "{\"type\": \"error\", \"data\": \"MPD disconnected.\"}");
if (response->conn_id > -1) {
LOG_DEBUG() fprintf(stderr, "DEBUG: Send http response to connection %lu (first 800 chars):\n%*.*s\n", request->conn_id, 0, 800, response->data);
tiny_queue_push(web_server_queue, response);
}
else {
free(response);
}
free(request);
}
}
break; break;
case MPD_CONNECTED: case MPD_CONNECTED:
fds[0].fd = mpd_connection_get_fd(mpd_state->conn); fds[0].fd = mpd_connection_get_fd(mpd_state->conn);
fds[0].events = POLLIN; fds[0].events = POLLIN;
pollrc = poll(fds, 1, 50); pollrc = poll(fds, 1, 50);
unsigned mpd_client_queue_length = tiny_queue_length(mpd_client_queue, 50); mpd_client_queue_length = tiny_queue_length(mpd_client_queue, 50);
if (pollrc > 0 || mpd_client_queue_length > 0) { if (pollrc > 0 || mpd_client_queue_length > 0) {
LOG_DEBUG() fprintf(stderr, "DEBUG: Leaving mpd idle mode.\n"); LOG_DEBUG() fprintf(stderr, "DEBUG: Leaving mpd idle mode.\n");
if (!mpd_send_noidle(mpd_state->conn)) { if (!mpd_send_noidle(mpd_state->conn)) {
@@ -1202,7 +1226,7 @@ static void mpd_client_idle(t_config *config, t_mpd_state *mpd_state) {
if (mpd_client_queue_length > 0) { if (mpd_client_queue_length > 0) {
//Handle request //Handle request
LOG_DEBUG() fprintf(stderr, "DEBUG: Handle request.\n"); LOG_DEBUG() fprintf(stderr, "DEBUG: Handle request.\n");
struct work_request_t *request = tiny_queue_shift(mpd_client_queue, 50); t_work_request *request = tiny_queue_shift(mpd_client_queue, 50);
if (request != NULL) { if (request != NULL) {
mpd_client_api(config, mpd_state, request); mpd_client_api(config, mpd_state, request);
} }