Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions LiveKitExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 20260609;
CURRENT_PROJECT_VERSION = 20260910;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 76TVFCUKK7;
Expand All @@ -670,7 +670,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MARKETING_VERSION = 2.15.0;
MARKETING_VERSION = 2.17.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -717,7 +717,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 20260609;
CURRENT_PROJECT_VERSION = 20260910;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 76TVFCUKK7;
Expand All @@ -734,7 +734,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MARKETING_VERSION = 2.15.0;
MARKETING_VERSION = 2.17.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
Expand Down Expand Up @@ -799,7 +799,7 @@
repositoryURL = "https://github.com/livekit/client-sdk-swift";
requirement = {
kind = exactVersion;
version = 2.15.3;
version = 2.17.0;
};
};
B5C2EF142D0114C800FAC766 /* XCRemoteSwiftPackageReference "components-swift" */ = {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions Multiplatform/Controllers/RoomContext.swift
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ final class RoomContext: ObservableObject {

@Published var showMessagesPanel: Bool = false {
didSet {
if showMessagesPanel { showAudioPanel = false }
if showMessagesPanel {
showAudioPanel = false
}
}
}

Expand All @@ -91,7 +93,9 @@ final class RoomContext: ObservableObject {

@Published var showAudioPanel: Bool = false {
didSet {
if showAudioPanel { showMessagesPanel = false }
if showAudioPanel {
showMessagesPanel = false
}
}
}

Expand Down Expand Up @@ -227,11 +231,9 @@ final class RoomContext: ObservableObject {
weak var screenShareTrack: LocalTrackPublication?

@available(macOS 12.3, *)
func setScreenShareMacOS(isEnabled: Bool, screenShareSource: MacOSScreenCaptureSource? = nil) async throws {
func setScreenShareMacOS(isEnabled: Bool, screenShareSource: sending MacOSScreenCaptureSource? = nil) async throws {

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Slight simplification of the previous fix.

if isEnabled, let screenShareSource {
// The capturer takes sole ownership of the source on the RTC executor (see SDK docs).
nonisolated(unsafe) let source = screenShareSource
let track = await LocalVideoTrack.createMacOSScreenShareTrack(source: source, options: ScreenShareCaptureOptions(appAudio: true))
let track = await LocalVideoTrack.createMacOSScreenShareTrack(source: screenShareSource, options: ScreenShareCaptureOptions(appAudio: true))
let options = VideoPublishOptions(preferredCodec: VideoCodec.h264)
screenShareTrack = try await room.localParticipant.publish(videoTrack: track, options: options)
}
Expand Down