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

[jsonapi] Support relative seeking

Browse Source
This commit is contained in:
chme 2019-09-01 08:50:49 +02:00 committed by ejurgensen
parent ced11ef0c1
commit d69f328973
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/httpd_jsonapi.c
View File

@ -1848,29 +1848,46 @@ jsonapi_reply_player_previous(struct httpd_request *hreq)
static int static int
jsonapi_reply_player_seek(struct httpd_request *hreq) jsonapi_reply_player_seek(struct httpd_request *hreq)
{ {
const char *param; const char *param_pos;
const char *param_seek;
int position_ms; int position_ms;
int seek_ms;
int ret; int ret;
param = evhttp_find_header(hreq->query, "position_ms"); param_pos = evhttp_find_header(hreq->query, "position_ms");
if (!param) param_seek = evhttp_find_header(hreq->query, "seek_ms");
if (!param_pos && !param_seek)
return HTTP_BADREQUEST; return HTTP_BADREQUEST;
ret = safe_atoi32(param, &position_ms); if (param_pos)
if (ret < 0) {
return HTTP_BADREQUEST; ret = safe_atoi32(param_pos, &position_ms);
if (ret < 0)
return HTTP_BADREQUEST;
ret = player_playback_seek(position_ms);
}
else
{
ret = safe_atoi32(param_seek, &seek_ms);
if (ret < 0)
return HTTP_BADREQUEST;
ret = player_playback_seek_rel(seek_ms);
}
ret = player_playback_seek(position_ms);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_WEB, "Error seeking to position %d.\n", position_ms); DPRINTF(E_LOG, L_WEB, "Error seeking (position_ms=%s, seek_ms=%s).\n",
(param_pos ? param_pos : ""), (param_seek ? param_seek : ""));
return HTTP_INTERNAL; return HTTP_INTERNAL;
} }
ret = player_playback_start(); ret = player_playback_start();
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_WEB, "Error starting playback after seeking to position %d.\n", position_ms); DPRINTF(E_LOG, L_WEB, "Error starting playback after seeking (position_ms=%s, seek_ms=%s).\n",
(param_pos ? param_pos : ""), (param_seek ? param_seek : ""));
return HTTP_INTERNAL; return HTTP_INTERNAL;
} }