refactor: use type aliases

Author: datagutt

crates/librist-sys/librist

@@ -15,6 +15,9 @@ use std::sync::Arc;
 // Callback Type Aliases
 // ============================================================================
 
+/// Log callback: (level, message).
+pub(crate) type LogCallback = Box<dyn Fn(crate::LogLevel, &str) + Send + Sync>;
+
 /// Stats callback for sender statistics.
 pub(crate) type StatsCallback<T> = Box<dyn Fn(&T) + Send + Sync>;
 

crates/librist/src/callbacks.rs

@@ -4,6 +4,9 @@ use std::ffi::CStr;
 use std::os::raw::{c_char, c_int, c_void};
 use std::ptr;
 
+/// Type alias for log callback closures.
+type LogCallbackFn = Box<dyn Fn(LogLevel, &str) + Send + Sync>;
+
 /// Log level for RIST operations.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
 #[repr(i32)]
@@ -115,7 +118,7 @@ impl LoggingSettings {
         F: Fn(LogLevel, &str) + Send + Sync + 'static,
     {
         // Box the callback and then box the trait object to get a thin pointer
-        let callback: Box<dyn Fn(LogLevel, &str) + Send + Sync> = Box::new(callback);
+        let callback: LogCallbackFn = Box::new(callback);
         let callback = Box::new(callback);
         // Get a raw pointer to the Box (thin pointer, properly aligned)
         let callback_ptr = Box::into_raw(callback);

crates/librist/src/logging.rs

@@ -3,7 +3,8 @@
 use crate::callbacks::{
     auth_connect_trampoline, auth_disconnect_trampoline, receiver_connection_trampoline,
     receiver_data_trampoline, receiver_oob_trampoline, receiver_stats_trampoline,
-    AuthConnectCallback, AuthDisconnectCallback, DataCallback, OobCallback, ReceiverCallbacks,
+    AuthConnectCallback, AuthDisconnectCallback, ConnectionCallback, DataCallback, LogCallback,
+    OobCallback, ReceiverCallbacks, StatsCallback,
 };
 use crate::data::DataBlock;
 use crate::error::{check_result, Error, Result};
@@ -344,12 +345,12 @@ unsafe impl Sync for RistReceiver {}
 pub struct ReceiverBuilder {
     profile: Profile,
     log_level: LogLevel,
-    log_callback: Option<Box<dyn Fn(LogLevel, &str) + Send + Sync>>,
+    log_callback: Option<LogCallback>,
     nack_type: NackType,
     fifo_size: Option<u32>,
     stats_interval_ms: Option<u32>,
-    stats_callback: Option<Box<dyn Fn(&ReceiverStats) + Send + Sync>>,
-    connection_callback: Option<Box<dyn Fn(u32, ConnectionStatus) + Send + Sync>>,
+    stats_callback: Option<StatsCallback<ReceiverStats>>,
+    connection_callback: Option<ConnectionCallback>,
     data_callback: Option<DataCallback>,
     auth_connect_callback: Option<AuthConnectCallback>,
     auth_disconnect_callback: Option<AuthDisconnectCallback>,

crates/librist/src/receiver.rs

@@ -2,7 +2,7 @@
 
 use crate::callbacks::{
     sender_connection_trampoline, sender_oob_trampoline, sender_stats_trampoline,
-    OobCallback, SenderCallbacks,
+    ConnectionCallback, LogCallback, OobCallback, SenderCallbacks, StatsCallback,
 };
 use crate::data::DataBlockBuilder;
 use crate::error::{check_result, Error, Result};
@@ -385,10 +385,10 @@ pub struct SenderBuilder {
     profile: Profile,
     flow_id: Option<u32>,
     log_level: LogLevel,
-    log_callback: Option<Box<dyn Fn(LogLevel, &str) + Send + Sync>>,
+    log_callback: Option<LogCallback>,
     stats_interval_ms: Option<u32>,
-    stats_callback: Option<Box<dyn Fn(&SenderStats) + Send + Sync>>,
-    connection_callback: Option<Box<dyn Fn(u32, ConnectionStatus) + Send + Sync>>,
+    stats_callback: Option<StatsCallback<SenderStats>>,
+    connection_callback: Option<ConnectionCallback>,
     oob_callback: Option<OobCallback>,
     enable_oob: bool,
 }

crates/librist/src/sender.rs

@@ -0,0 +1 @@
+Subproject commit 2199d37db92a68409e2d56d1220666d513c49870

inspiration/moblin

@@ -0,0 +1 @@
+Subproject commit 8963c42f19068f8a189e0e6934624a214256ad7c

inspiration/rist-bonding

@@ -0,0 +1 @@
+Subproject commit f3bfb84890fa0bae701682914dbb1659a96928c6

inspiration/rist-swift-wrapper

@@ -0,0 +1 @@
+Subproject commit 71801ba90717317d5167075135641371e3867635