mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-05 10:20:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Move ownership of MacOSDisplay to the rust side

Browse source
This commit is contained in:
Antonio Scandurra 2022-10-14 10:37:10 +02:00
parent 4222f86537
commit c25acc155d
3 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/capture/src/main.rs
View file

@ -59,14 +59,8 @@ fn main() {
room2.connect(&live_kit_url, &user2_token).await.unwrap();
cx.add_window(Default::default(), |cx| ScreenCaptureView::new(room2, cx));
let display = live_kit::display_sources()
.await
.unwrap()
.into_iter()
.next()
.unwrap();
let track = LocalVideoTrack::screen_share_for_display(display);
let display_sources = live_kit::display_sources().await.unwrap();
let track = LocalVideoTrack::screen_share_for_display(display_sources.first().unwrap());
room1.publish_video_track(&track).await.unwrap();
})
.detach();

2
crates/live_kit/LiveKitBridge/Sources/LiveKitBridge/LiveKitBridge.swift
View file

@ -88,7 +88,7 @@ public func LKRoomPublishVideoTrack(room: UnsafeRawPointer, track: UnsafeRawPoin
@_cdecl("LKCreateScreenShareTrackForDisplay")
public func LKCreateScreenShareTrackForDisplay(display: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer {
let display = Unmanaged<MacOSDisplay>.fromOpaque(display).takeRetainedValue()
let display = Unmanaged<MacOSDisplay>.fromOpaque(display).takeUnretainedValue()
let track = LocalVideoTrack.createMacOSScreenShareTrack(source: display, preferredMethod: .legacy)
return Unmanaged.passRetained(track).toOpaque()
}

8
crates/live_kit/src/live_kit.rs
View file

@ -187,11 +187,8 @@ impl Drop for RoomDelegate {
pub struct LocalVideoTrack(*const c_void);
impl LocalVideoTrack {
pub fn screen_share_for_display(display: MacOSDisplay) -> Self {
let ptr = display.0;
let this = Self(unsafe { LKCreateScreenShareTrackForDisplay(ptr) });
std::mem::forget(display);
this
pub fn screen_share_for_display(display: &MacOSDisplay) -> Self {
Self(unsafe { LKCreateScreenShareTrackForDisplay(display.0) })
}
}
@ -259,7 +256,6 @@ pub fn display_sources() -> impl Future<Output = Result<Vec<MacOSDisplay>>> {
let sources = CFArray::wrap_under_get_rule(sources);
let sources_vec = sources.iter().map(|source| MacOSDisplay(*source)).collect();
let _ = tx.send(Ok(sources_vec));
std::mem::forget(sources); // HACK: If I drop the CFArray, all the objects inside it get dropped and we get issues accessing the display later.
}
}
}