X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmixer.cpp;h=2fdbf645e876d89cc39022a411d75f2e92016ba3;hb=b9a74fdb2aaaec5f2859945f25bff9295da444e1;hp=191ddb7a50c64d5fd621d986dd452fbc2b0d9aec;hpb=02a4d8ccf0b7e29e857e46208adb4938f78c45df;p=nageru

diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp
index 191ddb7..2fdbf64 100644
--- a/nageru/mixer.cpp
+++ b/nageru/mixer.cpp
@@ -277,7 +277,7 @@ void QueueLengthPolicy::unregister_metrics(const vector<pair<string, string>> &l
 }
 
 void QueueLengthPolicy::update_policy(steady_clock::time_point now,
-                                      steady_clock::time_point expected_next_frame,
+                                      steady_clock::time_point expected_next_input_frame,
                                       int64_t input_frame_duration,
                                       int64_t master_frame_duration,
                                       double max_input_card_jitter_seconds,
@@ -288,7 +288,7 @@ void QueueLengthPolicy::update_policy(steady_clock::time_point now,
 
 	// Figure out when we can expect the next frame for this card, assuming
 	// worst-case jitter (ie., the frame is maximally late).
-	double seconds_until_next_frame = max(duration<double>(expected_next_frame - now).count() + max_input_card_jitter_seconds, 0.0);
+	double seconds_until_next_frame = max(duration<double>(expected_next_input_frame - now).count() + max_input_card_jitter_seconds, 0.0);
 
 	// How many times are the master card expected to tick in that time?
 	// We assume the master clock has worst-case jitter but not any rate
@@ -1976,7 +1976,7 @@ void Mixer::quit()
 	if (global_flags.srt_port >= 0) {
 		// There's seemingly no other reasonable way to wake up the thread
 		// (libsrt's epoll equivalent is busy-waiting).
-		int sock = srt_socket(AF_INET6, 0, 0);
+		int sock = srt_create_socket();
 		if (sock != -1) {
 			sockaddr_in6 addr;
 			memset(&addr, 0, sizeof(addr));
@@ -2185,7 +2185,7 @@ void Mixer::OutputChannel::set_color_updated_callback(Mixer::color_updated_callb
 #ifdef HAVE_SRT
 void Mixer::start_srt()
 {
-	SRTSOCKET sock = srt_socket(AF_INET6, 0, 0);
+	SRTSOCKET sock = srt_create_socket();
 	sockaddr_in6 addr;
 	memset(&addr, 0, sizeof(addr));
 	addr.sin6_family = AF_INET6;