diff --git a/src/modules/module-raop-sink.c b/src/modules/module-raop-sink.c index 58d1596a0..d829f9253 100644 --- a/src/modules/module-raop-sink.c +++ b/src/modules/module-raop-sink.c @@ -838,9 +838,9 @@ static int rtsp_send(struct impl *impl, const char *method, return res; } -static int rtsp_flush_reply(void *data, int status, const struct spa_dict *headers) +static int rtsp_log_reply_status(void *data, int status, const struct spa_dict *headers) { - pw_log_info("reply %d", status); + pw_log_info("reply status: %d", status); return 0; } @@ -857,7 +857,7 @@ static int rtsp_do_flush(struct impl *impl) impl->recording = false; - res = rtsp_send(impl, "FLUSH", NULL, NULL, rtsp_flush_reply); + res = rtsp_send(impl, "FLUSH", NULL, NULL, rtsp_log_reply_status); pw_properties_set(impl->headers, "Range", NULL); pw_properties_set(impl->headers, "RTP-Info", NULL); @@ -873,7 +873,7 @@ static int rtsp_send_volume(struct impl *impl) char header[128], volstr[64]; snprintf(header, sizeof(header), "volume: %s\r\n", spa_dtoa(volstr, sizeof(volstr), impl->volume)); - return rtsp_send(impl, "SET_PARAMETER", "text/parameters", header, NULL); + return rtsp_send(impl, "SET_PARAMETER", "text/parameters", header, rtsp_log_reply_status); } static int rtsp_record_reply(void *data, int status, const struct spa_dict *headers) @@ -887,7 +887,7 @@ static int rtsp_record_reply(void *data, int status, const struct spa_dict *head struct spa_latency_info latency; char progress[128]; - pw_log_info("reply %d", status); + pw_log_info("record status: %d", status); if ((str = spa_dict_lookup(headers, "Audio-Latency")) != NULL) { uint32_t l; @@ -913,7 +913,7 @@ static int rtsp_record_reply(void *data, int status, const struct spa_dict *head rtsp_send_volume(impl); snprintf(progress, sizeof(progress), "progress: %s/%s/%s\r\n", "0", "0", "0"); - return rtsp_send(impl, "SET_PARAMETER", "text/parameters", progress, NULL); + return rtsp_send(impl, "SET_PARAMETER", "text/parameters", progress, rtsp_log_reply_status); } static int rtsp_do_record(struct impl *impl) @@ -975,7 +975,7 @@ static int rtsp_setup_reply(void *data, int status, const struct spa_dict *heade uint16_t control_port, timing_port; int res; - pw_log_info("reply %d", status); + pw_log_info("setup status: %d", status); if ((str = spa_dict_lookup(headers, "Session")) == NULL) { pw_log_error("missing Session header"); @@ -1109,7 +1109,7 @@ static int rtsp_announce_reply(void *data, int status, const struct spa_dict *he { struct impl *impl = data; - pw_log_info("reply %d", status); + pw_log_info("announce status: %d", status); pw_properties_set(impl->headers, "Apple-Challenge", NULL); @@ -1298,7 +1298,7 @@ static int rtsp_auth_setup_reply(void *data, int status, const struct spa_dict * { struct impl *impl = data; - pw_log_info("reply %d", status); + pw_log_info("auth-setup status: %d", status); return rtsp_do_announce(impl); } @@ -1320,7 +1320,7 @@ static int rtsp_auth_reply(void *data, int status, const struct spa_dict *header struct impl *impl = data; int res = 0; - pw_log_info("auth %d", status); + pw_log_info("auth status: %d", status); switch (status) { case 200: @@ -1390,7 +1390,7 @@ static int rtsp_options_reply(void *data, int status, const struct spa_dict *hea struct impl *impl = data; int res = 0; - pw_log_info("options %d", status); + pw_log_info("options status: %d", status); switch (status) { case 401: @@ -1552,7 +1552,7 @@ static int rtsp_teardown_reply(void *data, int status, const struct spa_dict *he struct impl *impl = data; const char *str; - pw_log_info("reply"); + pw_log_info("teardown status: %d", status); connection_cleanup(impl);