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

[cast] Try to fix issue #270 by making a GET_STATUS if the normal reply to a LAUNCH does not arrive

Browse Source
This commit is contained in:
ejurgensen 2016-08-01 09:05:09 +02:00
parent 306dd47f1e
commit cbc3323111
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/outputs/cast.c
View File

@ -162,6 +162,11 @@ struct cast_session
cast_reply_cb callback_register[CALLBACK_REGISTER_SIZE]; cast_reply_cb callback_register[CALLBACK_REGISTER_SIZE];
struct event *reply_timeout; struct event *reply_timeout;
// This is used to work around a bug where no response is given by the device.
// For certain requests, we will then retry, e.g. by checking status. We
// register our retry so that we on only retry once.
int retry;
// Session info from the ChromeCast // Session info from the ChromeCast
char *transport_id; char *transport_id;
char *session_id; char *session_id;
@ -934,17 +939,34 @@ cast_cb_startup_launch(struct cast_session *cs, struct cast_msg_payload *payload
{ {
int ret; int ret;
// Sometimes the response to a LAUNCH is just a broadcast RECEIVER_STATUS
// without our requestId. That won't be registered by our response handler,
// and we get an empty callback due to timeout. In this case we send a
// GET_STATUS to see if we are good to go anyway.
if (!payload && !cs->retry)
{
DPRINTF(E_LOG, L_CAST, "No RECEIVER_STATUS reply to our LAUNCH - trying GET_STATUS instead\n");
cs->retry++;
ret = cast_msg_send(cs, GET_STATUS, cast_cb_startup_launch);
if (ret != 0)
goto error;
return;
}
if (!payload) if (!payload)
{ {
DPRINTF(E_LOG, L_CAST, "No RECEIVER_STATUS reply to our LAUNCH - aborting\n"); DPRINTF(E_LOG, L_CAST, "No RECEIVER_STATUS reply to our LAUNCH - aborting\n");
goto error; goto error;
} }
else if (payload->type != RECEIVER_STATUS)
if (payload->type != RECEIVER_STATUS)
{ {
DPRINTF(E_LOG, L_CAST, "No RECEIVER_STATUS reply to our LAUNCH (got type: %d) - aborting\n", payload->type); DPRINTF(E_LOG, L_CAST, "No RECEIVER_STATUS reply to our LAUNCH (got type: %d) - aborting\n", payload->type);
goto error; goto error;
} }
else if (!payload->transport_id || !payload->session_id)
if (!payload->transport_id || !payload->session_id)
{ {
DPRINTF(E_LOG, L_CAST, "Missing session id or transport id in RECEIVER_STATUS - aborting\n"); DPRINTF(E_LOG, L_CAST, "Missing session id or transport id in RECEIVER_STATUS - aborting\n");
goto error; goto error;
@ -956,6 +978,8 @@ cast_cb_startup_launch(struct cast_session *cs, struct cast_msg_payload *payload
cs->session_id = strdup(payload->session_id); cs->session_id = strdup(payload->session_id);
cs->transport_id = strdup(payload->transport_id); cs->transport_id = strdup(payload->transport_id);
cs->retry = 0;
ret = cast_msg_send(cs, MEDIA_CONNECT, NULL); ret = cast_msg_send(cs, MEDIA_CONNECT, NULL);
if (ret == 0) if (ret == 0)
ret = cast_msg_send(cs, MEDIA_GET_STATUS, cast_cb_startup_media); ret = cast_msg_send(cs, MEDIA_GET_STATUS, cast_cb_startup_media);