From 140162191388063e41e33b53d4533e07529df870 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 31 Aug 2011 20:19:36 +0200 Subject: [PATCH] output/raop: remove Audio-Jack-Status check The value of this is not used, the code is commented out - let's get rid of it. --- src/output/raop_output_plugin.c | 26 +------------------------- src/rtsp_client.c | 8 ++++++-- 2 files changed, 7 insertions(+), 27 deletions(-) diff --git a/src/output/raop_output_plugin.c b/src/output/raop_output_plugin.c index 573d2dfe9..735aea976 100644 --- a/src/output/raop_output_plugin.c +++ b/src/output/raop_output_plugin.c @@ -496,9 +496,6 @@ raopcl_connect(struct raop_data *rd, GError **error_r) char *sac=NULL, *key = NULL, *iv = NULL; char sdp[1024]; int rval = false; - struct key_data *setup_kd = NULL; - char *aj, *token, *pc; - const char delimiters[] = ";"; unsigned char rsakey[512]; struct timeval current_time; unsigned int sessionNum; @@ -543,30 +540,10 @@ raopcl_connect(struct raop_data *rd, GError **error_r) if (!rtspcl_announce_sdp(rd->rtspcl, sdp, error_r)) goto erexit; // if (!rtspcl_mark_del_exthds(rd->rtspcl, "Apple-Challenge")) goto erexit; - if (!rtspcl_setup(rd->rtspcl, &setup_kd, + if (!rtspcl_setup(rd->rtspcl, NULL, raop_session->ctrl.port, raop_session->ntp.port, error_r)) goto erexit; - if (!(aj = kd_lookup(setup_kd,"Audio-Jack-Status"))) { - g_set_error_literal(error_r, raop_output_quark(), 0, - "Audio-Jack-Status is missing"); - goto erexit; - } - - token = strtok(aj, delimiters); - while (token) { - if ((pc = strstr(token,"="))) { - *pc = 0; - if (!strcmp(token,"type") && !strcmp(pc+1,"digital")) { - // rd->ajtype = JACK_TYPE_DIGITAL; - } - } else { - if (!strcmp(token,"connected")) { - // rd->ajstatus = JACK_STATUS_CONNECTED; - } - } - token = strtok(NULL, delimiters); - } if (!get_sockaddr_by_host(rd->addr, rd->rtspcl->control_port, &rd->ctrl_addr, error_r)) @@ -588,7 +565,6 @@ raopcl_connect(struct raop_data *rd, GError **error_r) g_free(sac); g_free(key); g_free(iv); - free_kd(setup_kd); return rval; } diff --git a/src/rtsp_client.c b/src/rtsp_client.c index d05efa619..a808ef207 100644 --- a/src/rtsp_client.c +++ b/src/rtsp_client.c @@ -681,11 +681,15 @@ rtspcl_setup(struct rtspcl_data *rtspcld, struct key_data **kd, rval = true; erexit: g_free(buf); - if (!rval) { + + if (!rval || kd == NULL) { free_kd(rkd); rkd = NULL; } - *kd = rkd; + + if (kd != NULL) + *kd = rkd; + return rval; }