MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-28 08:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1120 from chme/mpd

Browse Source 
MPD fixes
This commit is contained in:
Christian Meffert 2020-11-22 11:41:17 +01:00 committed by GitHub
commit 9bcbeb1f1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mpd.c
View File

@ -108,7 +108,8 @@ enum command_list_type
{ {
COMMAND_LIST = 1, COMMAND_LIST = 1,
COMMAND_LIST_OK = 2, COMMAND_LIST_OK = 2,
COMMAND_LIST_NONE = 3 COMMAND_LIST_END = 3,
COMMAND_LIST_NONE = 4
}; };
/** /**
@ -1044,8 +1045,8 @@ mpd_command_status(struct evbuffer *evbuf, int argc, char **argv, char **errmsg,
evbuffer_add_printf(evbuf, evbuffer_add_printf(evbuf,
"nextsong: %d\n" "nextsong: %d\n"
"nextsongid: %d\n", "nextsongid: %d\n",
queue_item->id, queue_item->pos,
queue_item->pos); queue_item->id);
free_queue_item(queue_item, 0); free_queue_item(queue_item, 0);
} }
@ -4273,6 +4274,7 @@ mpd_read_cb(struct bufferevent *bev, void *ctx)
} }
else if (0 == strcmp(argv[0], "command_list_end")) else if (0 == strcmp(argv[0], "command_list_end"))
{ {
listtype = COMMAND_LIST_END;
free(line); free(line);
break; break;
} }
@ -4331,7 +4333,13 @@ mpd_read_cb(struct bufferevent *bev, void *ctx)
{ {
evbuffer_add(output, "list_OK\n", 8); evbuffer_add(output, "list_OK\n", 8);
} }
/*
* If everything was successful add OK line to signal clients end of command message.
*/
else if (listtype == COMMAND_LIST_NONE && idle_cmd == 0 && close_cmd == 0)
{
evbuffer_add(output, "OK\n", 3);
}
free(line); free(line);
ncmd++; ncmd++;
} }
@ -4339,10 +4347,11 @@ mpd_read_cb(struct bufferevent *bev, void *ctx)
DPRINTF(E_SPAM, L_MPD, "Finished MPD command sequence: %d\n", ret); DPRINTF(E_SPAM, L_MPD, "Finished MPD command sequence: %d\n", ret);
/* /*
* If everything was successful add OK line to signal clients end of message. * If everything was successful and we are processing a command list, add OK line to signal
* If an error occured the necessary ACK line should already be added to the response buffer. * clients end of message.
* If an error occurred the necessary ACK line should already be added to the response buffer.
*/ */
if (ret == 0 && idle_cmd == 0 && close_cmd == 0) if (ret == 0 && close_cmd == 0 && listtype == COMMAND_LIST_END)
{ {
evbuffer_add(output, "OK\n", 3); evbuffer_add(output, "OK\n", 3);
} }