Skip to content

Avoid duplicate Swift symbols from apple-cf #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1313 merged 2 commits into from
Jul 18, 2026
Merged

Avoid duplicate Swift symbols from apple-cf #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f945f67
swift: avoid CoreMedia bridge symbol collisions
grishy Jul 18, 2026
1a6a1ad
examples: satisfy Rust 1.97 clippy
grishy Jul 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions examples/16_full_metal_app/ui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ impl VertexBufferBuilder {
("Select a Source to Begin".to_string(), [0.6, 0.5, 0.7, 1.0])
} else if has_source {
let display = if source_name.len() > 30 {
format!("{}...", &source_name.chars().take(27).collect::<String>())
format!("{}...", source_name.chars().take(27).collect::<String>())
} else {
source_name.to_string()
};
Expand Down Expand Up @@ -176,7 +176,7 @@ impl VertexBufferBuilder {
if !format_info.is_empty() {
// Truncate if too long
let display_info = if format_info.len() > 40 {
format!("{}...", &format_info.chars().take(37).collect::<String>())
format!("{}...", format_info.chars().take(37).collect::<String>())
} else {
format_info.to_string()
};
Expand Down Expand Up @@ -293,7 +293,7 @@ impl VertexBufferBuilder {
self.text(font, name, text_x, text_y, scale, name_color);

let t: String = if value.len() > 12 {
format!("{}...", &value.chars().take(9).collect::<String>())
format!("{}...", value.chars().take(9).collect::<String>())
} else {
value
};
Expand Down
10 changes: 5 additions & 5 deletions swift-bridge/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import PackageDescription
//
// Note: CoreGraphicsBridge / CoreVideoBridge / IOSurfaceBridge / DispatchBridge
// targets that used to live here were extracted into apple-cf-rs's bridge.
// CoreMediaBridge here keeps only the SCStreamFrameInfo attachment readers
// and a few generic accessors with frame-info-specific signatures —
// everything else comes from apple-cf's CoreMediaBridge target.
// ScreenCaptureKitCoreMediaBridge keeps only the SCStreamFrameInfo attachment
// readers and a few generic accessors with frame-info-specific signatures.
// Generic CoreMedia bindings come from apple-cf's CoreMediaBridge target.

let package = Package(
name: "ScreenCaptureKitBridge",
Expand All @@ -25,14 +25,14 @@ let package = Package(
// Main ScreenCaptureKit bindings.
.target(
name: "ScreenCaptureKitBridge",
dependencies: ["CoreMediaBridge", "MetalBridge"],
dependencies: ["ScreenCaptureKitCoreMediaBridge", "MetalBridge"],
path: "Sources/ScreenCaptureKitBridge"),
// CoreMedia bindings — only the SCStreamFrameInfo attachment readers
// and SC-specific sample-buffer helpers. Generic CMSampleBuffer /
// CMBlockBuffer / CMFormatDescription accessors come from
// apple-cf-rs's CoreMediaBridge.
.target(
name: "CoreMediaBridge",
name: "ScreenCaptureKitCoreMediaBridge",
path: "Sources/CoreMedia"),
// Metal framework bindings (MTLDevice, MTLTexture, etc.) — apple-cf
// doesn't provide a metal module yet so this stays local.
Expand Down
Loading