From: Mike Brady Date: Thu, 17 May 2018 10:29:59 +0000 (+0100) Subject: Change some debug messages. X-Git-Tag: 3.2RC8~2^2~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0237fb42070a6f941cb39032c63f9ce9650bf7c;p=thirdparty%2Fshairport-sync.git Change some debug messages. --- diff --git a/player.c b/player.c index 32434ed3..67fac035 100644 --- a/player.c +++ b/player.c @@ -2327,17 +2327,21 @@ static void *player_thread_func(void *arg) { if (config.output->stop) config.output->stop(); - debug(3, "Shutting down timing, control and audio threads"); + debug(2, "Cancelling timing, control and audio threads"); pthread_cancel(rtp_timing_thread); - pthread_join(rtp_timing_thread, NULL); pthread_cancel(rtp_control_thread); - pthread_join(rtp_control_thread, NULL); pthread_cancel(rtp_audio_thread); + debug(2, "Joining terminated threads."); + pthread_join(rtp_timing_thread, NULL); + debug(2, "Timing thread terminated."); + pthread_join(rtp_control_thread, NULL); + debug(2, "Control thread terminated."); pthread_join(rtp_audio_thread, NULL); + debug(2, "Audio thread terminated."); clear_reference_timestamp(conn); conn->rtp_running = 0; - debug(3, "Freeing audio buffers and decoders."); + debug(2, "Freeing audio buffers and decoders."); free_audio_buffers(conn); terminate_decoders(conn); diff --git a/rtp.c b/rtp.c index e15c18ad..cecae3e7 100644 --- a/rtp.c +++ b/rtp.c @@ -68,6 +68,7 @@ void rtp_terminate(rtsp_conn_info *conn) { void rtp_audio_receiver_cleanup_handler(void *arg) { rtsp_conn_info *conn = (rtsp_conn_info *)arg; close(conn->audio_socket); + debug(3,"Audio Receiver Cleanup Successful."); } void *rtp_audio_receiver(void *arg) { @@ -187,6 +188,7 @@ void *rtp_audio_receiver(void *arg) { void rtp_control_handler_cleanup_handler(void *arg) { rtsp_conn_info *conn = (rtsp_conn_info *)arg; close(conn->control_socket); + debug(3,"Control Receiver Cleanup Successful."); } void *rtp_control_receiver(void *arg) { @@ -470,6 +472,7 @@ void rtp_timing_receiver_cleanup_handler(void *arg) { pthread_cancel(timer_requester); pthread_join(timer_requester, NULL); close(conn->timing_socket); + debug(3,"Timing Receiver Cleanup Successful."); } void *rtp_timing_receiver(void *arg) {