MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-14 08:15:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Support for playqueue-edit

Browse Source
This commit is contained in:
ejurgensen 2013-11-22 16:41:57 +01:00
parent 4d542f9e22
commit afd25b79d9
3 changed files with 52 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/httpd_dacp.c
View File

@ -223,22 +223,34 @@ make_playstatusupdate(struct evbuffer *evbuf)
dmap_add_int(psu, "cmsr", current_rev); /* 12 */
dmap_add_char(psu, "cavc", 1); /* 9 */ /* volume controllable */
dmap_add_char(psu, "caps", status.status); /* 9 */ /* play status, 2 = stopped, 3 = paused, 4 = playing */
dmap_add_char(psu, "cash", status.shuffle); /* 9 */ /* shuffle, true/false */
dmap_add_char(psu, "carp", status.repeat); /* 9 */ /* repeat, 0 = off, 1 = repeat song, 2 = repeat (playlist) */
dmap_add_int(psu, "caas", 2); /* 12 */ /* available shuffle states */
dmap_add_int(psu, "caar", 6); /* 12 */ /* available repeat states */
dmap_add_char(psu, "caps", status.status); /* 9 */ /* play status, 2 = stopped, 3 = paused, 4 = playing */
dmap_add_char(psu, "cash", status.shuffle); /* 9 */ /* shuffle, true/false */
dmap_add_char(psu, "carp", status.repeat); /* 9 */ /* repeat, 0 = off, 1 = repeat song, 2 = repeat (playlist) */
dmap_add_char(psu, "cafs", 0); /* 9 */ /* dacp.fullscreen */
dmap_add_char(psu, "cavs", 0); /* 9 */ /* dacp.visualizer */
dmap_add_char(psu, "cavc", 1); /* 9 */ /* volume controllable */
dmap_add_int(psu, "caas", 2); /* 12 */ /* available shuffle states */
dmap_add_int(psu, "caar", 6); /* 12 */ /* available repeat states */
dmap_add_char(psu, "cafe", 0); /* 9 */ /* dacp.fullscreenenabled */
dmap_add_char(psu, "cave", 0); /* 9 */ /* dacp.visualizerenabled */
if (mfi)
{
dacp_nowplaying(psu, &status, mfi);
dmap_add_int(psu, "casa", 1); /* 12 */ /* unknown */
dmap_add_int(psu, "astm", mfi->song_length);
dmap_add_char(psu, "casc", 1); /* Maybe an indication of extra data? */
dmap_add_char(psu, "caks", 6); /* Unknown */
dacp_playingtime(psu, &status, mfi);
free_mfi(mfi, 0);
}
dmap_add_char(psu, "casu", 1); /* 9 */ /* unknown */
dmap_add_char(psu, "ceQu", 0); /* 9 */ /* unknown */
dmap_add_container(evbuf, "cmst", EVBUFFER_LENGTH(psu)); /* 8 + len */
ret = evbuffer_add_buffer(evbuf, psu);
@ -733,7 +745,7 @@ dacp_reply_cue_play(struct evhttp_request *req, struct evbuffer *evbuf, char **u
{
sort = evhttp_find_header(query, "sort");
ret = player_queue_make_daap(&ps, cuequery, NULL, sort);
ret = player_queue_make_daap(&ps, cuequery, NULL, sort, 0);
if (ret < 0)
{
DPRINTF(E_LOG, L_DACP, "Could not build song queue\n");
@ -765,6 +777,10 @@ dacp_reply_cue_play(struct evhttp_request *req, struct evbuffer *evbuf, char **u
DPRINTF(E_LOG, L_DACP, "Invalid index (%s) in cue request\n", param);
}
/* If selection was from Up Next queue (command will be playnow), then index is relative */
if ((param = evhttp_find_header(query, "command")) && (strcmp(param, "playnow") == 0))
id += status.pos_pl;
ret = player_playback_start(&id);
if (ret < 0)
{
@ -1249,6 +1265,7 @@ dacp_reply_playqueueedit_add(struct evhttp_request *req, struct evbuffer *evbuf,
uint32_t idx;
int mode;
int ret;
int quirkyquery;
param = evhttp_find_header(query, "mode");
if (param)
@ -1258,7 +1275,7 @@ dacp_reply_playqueueedit_add(struct evhttp_request *req, struct evbuffer *evbuf,
{
DPRINTF(E_LOG, L_DACP, "Invalid mode value in playqueue-edit request\n");
dmap_send_error(req, "cmst", "Invalid request");
dmap_send_error(req, "cacr", "Invalid request");
return;
}
}
@ -1272,15 +1289,18 @@ dacp_reply_playqueueedit_add(struct evhttp_request *req, struct evbuffer *evbuf,
editquery = evhttp_find_header(query, "query");
if (editquery)
{
/* This query kind needs special treatment */
quirkyquery = (mode == 1) && strstr(editquery, "dmap.itemid:");
queuefilter = evhttp_find_header(query, "queuefilter");
sort = evhttp_find_header(query, "sort");
ret = player_queue_make_daap(&ps, editquery, queuefilter, sort);
ret = player_queue_make_daap(&ps, editquery, queuefilter, sort, quirkyquery);
if (ret < 0)
{
DPRINTF(E_LOG, L_DACP, "Could not build song queue\n");
dmap_send_error(req, "cmst", "Invalid request");
dmap_send_error(req, "cacr", "Invalid request");
return;
}
@ -1292,7 +1312,7 @@ dacp_reply_playqueueedit_add(struct evhttp_request *req, struct evbuffer *evbuf,
{
DPRINTF(E_LOG, L_DACP, "Could not add song queue, DACP query missing\n");
dmap_send_error(req, "cmst", "Invalid request");
dmap_send_error(req, "cacr", "Invalid request");
return;
}
@ -1307,9 +1327,15 @@ dacp_reply_playqueueedit_add(struct evhttp_request *req, struct evbuffer *evbuf,
{
DPRINTF(E_LOG, L_DACP, "Could not start playback\n");
dmap_send_error(req, "cmst", "Playback failed to start");
dmap_send_error(req, "cacr", "Playback failed to start");
return;
}
dmap_add_container(evbuf, "cacr", 24); /* 8 + len */
dmap_add_int(evbuf, "mstt", 200); /* 12 */
dmap_add_int(evbuf, "miid", ps->id); /* 12 */
httpd_send_reply(req, HTTP_OK, "OK", evbuf);
}
static void
@ -1331,9 +1357,6 @@ dacp_reply_playqueueedit(struct evhttp_request *req, struct evbuffer *evbuf, cha
User selected track (playlist tab):
?command=add&query='dmap.containeritemid:...'&queuefilter=playlist:...&sort=physical&mode=1&session-id=...
-> clear queue, play containeritemid and the rest of playlist
User selected track (artist tab):
?command=add&query='dmap.itemid:...'&mode=1&session-id=...
-> clear queue, play itemid and the rest of artist tracks
User selected shuffle (artist tab):
?command=add&query='...'&sort=album&mode=2&session-id=...
-> clear queue, play shuffled query results
@ -1346,6 +1369,11 @@ dacp_reply_playqueueedit(struct evhttp_request *req, struct evbuffer *evbuf, cha
User selected track in queue:
?command=playnow&index=...&session-id=...
-> play index
And the quirky query - no sort and no queuefilter:
User selected track (artist tab):
?command=add&query='dmap.itemid:...'&mode=1&session-id=...
-> clear queue, play itemid and the rest of artist tracks
*/
s = daap_session_find(req, query, evbuf);
@ -1362,9 +1390,9 @@ dacp_reply_playqueueedit(struct evhttp_request *req, struct evbuffer *evbuf, cha
}
if (strcmp(param, "clear") == 0)
dacp_reply_cue_clear(req, evbuf, uri, query); // TODO this might give wrong reply container
dacp_reply_cue_clear(req, evbuf, uri, query);
else if (strcmp(param, "playnow") == 0)
dacp_reply_cue_play(req, evbuf, uri, query); // TODO index is wrong + this might give wrong reply container
dacp_reply_cue_play(req, evbuf, uri, query);
else if (strcmp(param, "add") == 0)
dacp_reply_playqueueedit_add(req, evbuf, uri, query);
else

8
src/player.c
View File

@ -553,7 +553,6 @@ player_queue_make(struct query_params *qp, const char *sort)
int ret;
qp->idx_type = I_NONE;
qp->sort = S_NONE;
if (sort)
{
@ -700,7 +699,7 @@ fetch_first_query_match(const char *query, struct db_media_file_info *dbmfi)
/* Thread: httpd (DACP) */
int
player_queue_make_daap(struct player_source **head, const char *query, const char *queuefilter, const char *sort)
player_queue_make_daap(struct player_source **head, const char *query, const char *queuefilter, const char *sort, int quirk)
{
struct query_params qp;
struct player_source *ps;
@ -721,6 +720,7 @@ player_queue_make_daap(struct player_source **head, const char *query, const cha
qp.offset = 0;
qp.limit = 0;
qp.sort = S_NONE;
id = 0;
@ -760,9 +760,10 @@ player_queue_make_daap(struct player_source **head, const char *query, const cha
return -1;
}
}
else if (strstr(query, "dmap.itemid:") && dbmfi.album_artist)
else if (quirk && dbmfi.album_artist)
{
safe_atou32(dbmfi.id, &id);
qp.sort = S_ALBUM;
qp.type = Q_ITEMS;
snprintf(buf, sizeof(buf), "f.album_artist = \"%s\"", dbmfi.album_artist);
qp.filter = strdup(buf);
@ -808,6 +809,7 @@ player_queue_make_pl(int plid, uint32_t *id)
qp.type = Q_PLITEMS;
qp.offset = 0;
qp.limit = 0;
qp.sort = S_NONE;
ps = player_queue_make(&qp, NULL);

2
src/player.h
View File

@ -124,7 +124,7 @@ int
player_shuffle_set(int enable);
int
player_queue_make_daap(struct player_source **head, const char *query, const char *queuefilter, const char *sort);
player_queue_make_daap(struct player_source **head, const char *query, const char *queuefilter, const char *sort, int quirk);
struct player_source *
player_queue_make_pl(int plid, uint32_t *id);