From ae44a3828512579455311174fb20352f898b4d6a Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Fri, 21 Oct 2022 10:12:24 +0200 Subject: [PATCH] Remove unused `LKDisplays` API --- crates/call/src/call.rs | 1 - .../Sources/LiveKitBridge/LiveKitBridge.swift | 16 ---------------- crates/live_kit_client/src/prod.rs | 7 ------- crates/live_kit_client/src/test.rs | 4 ---- 4 files changed, 28 deletions(-) diff --git a/crates/call/src/call.rs b/crates/call/src/call.rs index 11532599326fdd8581f69530e4482c20cd3bc674..6b06d04375b8a1fca563ef3be558f823ce45cd1c 100644 --- a/crates/call/src/call.rs +++ b/crates/call/src/call.rs @@ -14,7 +14,6 @@ pub use room::Room; use std::sync::Arc; pub fn init(client: Arc, user_store: ModelHandle, cx: &mut MutableAppContext) { - live_kit_client::displays(); let active_call = cx.add_model(|cx| ActiveCall::new(client, user_store, cx)); cx.set_global(active_call); } diff --git a/crates/live_kit_client/LiveKitBridge/Sources/LiveKitBridge/LiveKitBridge.swift b/crates/live_kit_client/LiveKitBridge/Sources/LiveKitBridge/LiveKitBridge.swift index 9a21b178002733c4cf1f620d1e1f681ea3a42038..f9380d747e3bb2807efa95df64465d4e4309c04f 100644 --- a/crates/live_kit_client/LiveKitBridge/Sources/LiveKitBridge/LiveKitBridge.swift +++ b/crates/live_kit_client/LiveKitBridge/Sources/LiveKitBridge/LiveKitBridge.swift @@ -155,19 +155,3 @@ public func LKDisplaySources(data: UnsafeRawPointer, callback: @escaping @conven callback(data, nil, error.localizedDescription as CFString) } } - -@_cdecl("LKDisplays") -public func LKDisplays() { - if #available(macOS 12.3, *) { - Task.init { - let content = try await SCShareableContent.current - print(content.displays.count) - } - -// SCShareableContent.getWithCompletionHandler { content, error in -// print(content!.displays.count) -// } - } else { - print("OOOPS") - } -} diff --git a/crates/live_kit_client/src/prod.rs b/crates/live_kit_client/src/prod.rs index a0879f016a2f6a8a8d021fb533f24795407b1522..35a5705a24d47e6e4975aac3b52cfc5e0fc29441 100644 --- a/crates/live_kit_client/src/prod.rs +++ b/crates/live_kit_client/src/prod.rs @@ -62,7 +62,6 @@ extern "C" { fn LKVideoTrackAddRenderer(track: *const c_void, renderer: *const c_void); fn LKRemoteVideoTrackGetSid(track: *const c_void) -> CFStringRef; - fn LKDisplays(); fn LKDisplaySources( callback_data: *mut c_void, callback: extern "C" fn( @@ -74,12 +73,6 @@ extern "C" { fn LKCreateScreenShareTrackForDisplay(display: *const c_void) -> *const c_void; } -pub fn displays() { - unsafe { - LKDisplays(); - } -} - pub type Sid = String; pub struct Room { diff --git a/crates/live_kit_client/src/test.rs b/crates/live_kit_client/src/test.rs index e68bff1bf9c9bac5cfceae5d016ef7c2c57f7ba3..23076e13a5cd6629abbdc6939a8d2c76000bb32a 100644 --- a/crates/live_kit_client/src/test.rs +++ b/crates/live_kit_client/src/test.rs @@ -9,10 +9,6 @@ use media::core_video::CVImageBuffer; use parking_lot::Mutex; use std::{future::Future, sync::Arc}; -pub fn displays() { - panic!() -} - lazy_static! { static ref SERVERS: Mutex>> = Default::default(); }