From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Thu, 13 May 2021 19:59:38 +0000 (+0100) Subject: clang X-Git-Tag: 4.0-dev~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e41795f4dad1dd4a01f4eee4ed3fbd1ead0087d2;p=thirdparty%2Fshairport-sync.git clang --- diff --git a/player.c b/player.c index 1a4d855e..5996c5c4 100644 --- a/player.c +++ b/player.c @@ -2305,7 +2305,7 @@ void *player_thread_func(void *arg) { debug(1, "Large positive sync error of: %" PRId64 " frames (%f seconds).", sync_error, (sync_error * 1.0) / config.output_rate); int64_t local_frames_to_drop = sync_error / conn->output_sample_ratio; - uint32_t frames_to_drop_sized = local_frames_to_drop; + uint32_t frames_to_drop_sized = local_frames_to_drop; do_flush(inframe->given_timestamp + frames_to_drop_sized, conn); } else if ((sync_error < 0) && ((-sync_error) > filler_length)) { debug(1, diff --git a/rtp.c b/rtp.c index 22424632..a78a1156 100644 --- a/rtp.c +++ b/rtp.c @@ -1274,7 +1274,8 @@ int get_ptp_anchor_local_time_info(rtsp_conn_info *conn, uint32_t *anchorRTP, if ((clock_status_t)response != conn->clock_status) { switch (response) { case clock_ok: - debug(1, "Connection %d: NQPTP new master clock % " PRIx64 ".", conn->connection_number, actual_clock_id); + debug(1, "Connection %d: NQPTP new master clock % " PRIx64 ".", conn->connection_number, + actual_clock_id); break; case clock_service_unavailable: debug(1, "Connection %d: NQPTP clock is not available.", conn->connection_number); @@ -1311,7 +1312,7 @@ int get_ptp_anchor_local_time_info(rtsp_conn_info *conn, uint32_t *anchorRTP, } conn->clock_status = response; } - + if ((response != clock_ok) && (conn->last_anchor_info_is_valid != 0)) { if (anchorRTP != NULL) *anchorRTP = conn->anchor_rtptime;