]> git.ipfire.org Git - thirdparty/shairport-sync.git/commitdiff
Change some debug messages.
authorMike Brady <mikebrady@eircom.net>
Thu, 17 May 2018 10:29:59 +0000 (11:29 +0100)
committerMike Brady <mikebrady@eircom.net>
Thu, 17 May 2018 10:29:59 +0000 (11:29 +0100)
player.c
rtp.c

index 32434ed36c3ede8d8aa4b6126488a8d05457f84c..67fac035d2da33a6be663cefadd4104453beb885 100644 (file)
--- 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 e15c18ad34d2d08b757b7a08a97c1c1057b89719..cecae3e7590bc995c8d2c94af4b723d79bbaab9d 100644 (file)
--- 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) {