MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #105 from chme/playqueue 

Improve behaviour for playing from history
This commit is contained in:
ejurgensen 2015-02-26 18:55:38 +01:00
parent c2b5c08f36 10f2eb2409
commit 01fd561107
1 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/httpd_dacp.c
View File

@ -727,6 +727,8 @@ dacp_reply_cue_play(struct evhttp_request *req, struct evbuffer *evbuf, char **u
uint32_t id;
uint32_t pos;
int clear;
struct player_history *history;
int hist;
int ret;
/* /cue?command=play&query=...&sort=...&index=N */
@ -783,12 +785,43 @@ 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 */
//TODO playnow for mode = 1 (index is relativ to the history queue
/* If selection was from Up Next queue or history queue (command will be playnow), then index is relative */
hist = 0;
if ((param = evhttp_find_header(query, "command")) && (strcmp(param, "playnow") == 0))
pos += status.pos_pl;
{
/* If mode parameter is -1, the index is relative to the history queue, otherwise to the Up Next queue */
param = evhttp_find_header(query, "mode");
if (param && (strcmp(param, "-1") == 0))
{
/* Play from history queue */
hist = 1;
history = player_history_get();
if (history->count > pos)
{
pos = (history->start_index + history->count - pos - 1) % MAX_HISTORY_COUNT;
id = history->id[pos];
}
else
{
DPRINTF(E_LOG, L_DACP, "Could not start playback from history\n");
dmap_send_error(req, "cacr", "Playback failed to start");
return;
}
}
else
{
/* Play from Up Next queue */
pos += status.pos_pl;
}
}
/* If playing from history queue, the pos holds the id of the item to play */
if (hist)
ret = player_playback_startid(id, &id);
else
ret = player_playback_startpos(pos, &id);
ret = player_playback_startpos(pos, &id);
if (ret < 0)
{
DPRINTF(E_LOG, L_DACP, "Could not start playback\n");