nils/shairport-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include a few fixes for FreeBSD warnings and quieten some debug messages

Browse Source
This commit is contained in:
Mike Brady
2018-08-22 15:10:38 +01:00
parent d2f6a446e1
commit 44c61835b8
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
audio_alsa.c
+2 -1
View File
@@ -1001,9 +1001,10 @@ static int play(void *buf, int samples) {
}
}
uint64_t tf = get_absolute_time_in_fp();
measurement_time = get_absolute_time_in_fp();
frames_played_at_measurement_time = frames_sent_for_playing - fl;
if (frame_index == start_measurement_from_this_frame) {
debug(1,"Start frame counting");
frames_played_at_measurement_start_time = frames_played_at_measurement_time;
measurement_start_time = measurement_time;
measurement_data_is_valid = 1;
player.c
+5 -12
View File
@@ -2107,20 +2107,13 @@ void *player_thread_func(void *arg) {
int64_t should_be_frame;
local_time_to_frame(local_time_now, &should_be_frame, conn);
<<<<<<< HEAD
//if (abs(td_in_frames + rt - should_be_frame) > 10 * conn->output_sample_ratio)
// int64_t absolute_difference_in_frames = td_in_frames + rt - should_be_frame;
// if (absolute_difference_in_frames < 0)
// absolute_difference_in_frames = -absolute_difference_in_frames;
// if (absolute_difference_in_frames > 10 * conn->output_sample_ratio)
// debug(1, "Difference between old and new frame number is %" PRId64 " frames.",
// td_in_frames + rt - should_be_frame);
=======
int64_t absolute_difference_in_frames = td_in_frames + rt - should_be_frame;
if (absolute_difference_in_frames < 0)
absolute_difference_in_frames = -absolute_difference_in_frames;
if (absolute_difference_in_frames > 10 * conn->output_sample_ratio)
debug(1, "Difference between old and new frame number is %" PRId64 " frames.",
td_in_frames + rt - should_be_frame);
>>>>>>> 347e63ba906e80bfc01596bacfbd18fbe0b6f940
// this is the actual delay, including the latency we actually want, which will
// fluctuate a good bit about a potentially rising or falling trend.