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

[dacp] Don't return hard error if queue item goes missing

Browse Source 
Remote doesn't seem to like the 500 Internal error we were sending
if queue item went missing, e.g. during pause.
This commit is contained in:
ejurgensen 2016-03-23 20:38:19 +01:00
parent c4713d8b39
commit dbf9a208b8
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/httpd_dacp.c
View File

@ -156,6 +156,16 @@ static struct dacp_update_request *update_requests;
static struct event *seek_timer; static struct event *seek_timer;
static int seek_target; static int seek_target;
/* If an item is removed from the library while in the queue, we replace it with this */
static struct media_file_info dummy_mfi =
{
.id = 9999999,
.title = "(unknown title)",
.artist = "(unknown artist)",
.album = "(unknown album)",
.genre = "(unknown genre)",
};
/* DACP helpers */ /* DACP helpers */
static void static void
@ -240,7 +250,7 @@ make_playstatusupdate(struct evbuffer *evbuf)
{ {
DPRINTF(E_LOG, L_DACP, "Could not fetch file id %d\n", status.id); DPRINTF(E_LOG, L_DACP, "Could not fetch file id %d\n", status.id);
return -1; mfi = &dummy_mfi;
} }
} }
else else
@ -272,7 +282,8 @@ make_playstatusupdate(struct evbuffer *evbuf)
dacp_playingtime(psu, &status, mfi); dacp_playingtime(psu, &status, mfi);
free_mfi(mfi, 0); if (mfi != &dummy_mfi)
free_mfi(mfi, 0);
} }
dmap_add_char(psu, "casu", 1); /* 9 */ /* unknown */ dmap_add_char(psu, "casu", 1); /* 9 */ /* unknown */
@ -1453,7 +1464,7 @@ playqueuecontents_add_source(struct evbuffer *songlist, uint32_t source_id, int
if (!mfi) if (!mfi)
{ {
DPRINTF(E_LOG, L_DACP, "Could not fetch file id %d\n", source_id); DPRINTF(E_LOG, L_DACP, "Could not fetch file id %d\n", source_id);
return -1; mfi = &dummy_mfi;
} }
dmap_add_container(song, "ceQs", 16); dmap_add_container(song, "ceQs", 16);
dmap_add_raw_uint32(song, 1); /* Database */ dmap_add_raw_uint32(song, 1); /* Database */
@ -1476,7 +1487,8 @@ playqueuecontents_add_source(struct evbuffer *songlist, uint32_t source_id, int
ret = evbuffer_add_buffer(songlist, song); ret = evbuffer_add_buffer(songlist, song);
evbuffer_free(song); evbuffer_free(song);
free_mfi(mfi, 0); if (mfi != &dummy_mfi)
free_mfi(mfi, 0);
if (ret < 0) if (ret < 0)
{ {