fix: expose missing ObjC methods on RemoteTrackPublication

livekit · Jan 12, 2024 · 8e1043d · 8e1043d
1 parent 38b7527
commit 8e1043d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/Sources/LiveKit/Core/SignalClient.swift b/Sources/LiveKit/Core/SignalClient.swift
@@ -471,7 +471,7 @@ extension SignalClient {
 
     func sendUpdateSubscription(participantSid: Sid,
                                 trackSid: String,
-                                subscribed: Bool) async throws
+                                isSubscribed: Bool) async throws
     {
         let p = Livekit_ParticipantTracks.with {
             $0.participantSid = participantSid
@@ -482,7 +482,7 @@ extension SignalClient {
             $0.subscription = Livekit_UpdateSubscription.with {
                 $0.trackSids = [trackSid] // Deprecated
                 $0.participantTracks = [p]
-                $0.subscribe = subscribed
+                $0.subscribe = isSubscribed
             }
         }
 

diff --git a/Sources/LiveKit/TrackPublications/RemoteTrackPublication.swift b/Sources/LiveKit/TrackPublications/RemoteTrackPublication.swift
@@ -28,8 +28,14 @@ public enum SubscriptionState: Int, Codable {
 
 @objc
 public class RemoteTrackPublication: TrackPublication {
+    // MARK: - Public
+
+    @objc
     public var isSubscriptionAllowed: Bool { _state.isSubscriptionAllowed }
+
+    @objc
     public var isEnabled: Bool { _state.trackSettings.isEnabled }
+
     override public var isMuted: Bool { track?.isMuted ?? _state.isMetadataMuted }
 
     // MARK: - Private
@@ -64,12 +70,14 @@ public class RemoteTrackPublication: TrackPublication {
         return _state.isSubscribePreferred != false && super.isSubscribed
     }
 
+    @objc
     public var subscriptionState: SubscriptionState {
         if !isSubscriptionAllowed { return .notAllowed }
         return isSubscribed ? .subscribed : .unsubscribed
     }
 
     /// Subscribe or unsubscribe from this track.
+    @objc
     public func set(subscribed newValue: Bool) async throws {
         guard _state.isSubscribePreferred != newValue else { return }
 
@@ -79,12 +87,13 @@ public class RemoteTrackPublication: TrackPublication {
 
         try await participant.room.engine.signalClient.sendUpdateSubscription(participantSid: participant.sid,
                                                                               trackSid: sid,
-                                                                              subscribed: newValue)
+                                                                              isSubscribed: newValue)
     }
 
     /// Enable or disable server from sending down data for this track.
     ///
     /// This is useful when the participant is off screen, you may disable streaming down their video to reduce bandwidth requirements.
+    @objc
     public func set(enabled newValue: Bool) async throws {
         // No-op if already the desired value
         let trackSettings = _state.trackSettings
@@ -98,6 +107,7 @@ public class RemoteTrackPublication: TrackPublication {
     }
 
     /// Set preferred video FPS for this track.
+    @objc
     public func set(preferredFPS newValue: UInt) async throws {
         // No-op if already the desired value
         let trackSettings = _state.trackSettings

diff --git a/Sources/LiveKit/TrackPublications/TrackPublication.swift b/Sources/LiveKit/TrackPublications/TrackPublication.swift
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import Combine
-import CoreGraphics
 import Foundation
 
 @objc
@@ -94,7 +92,7 @@ public class TrackPublication: NSObject, ObservableObject, Loggable {
         var latestInfo: Livekit_TrackInfo?
     }
 
-    var _state: StateSync<State>
+    let _state: StateSync<State>
 
     init(info: Livekit_TrackInfo,
          track: Track? = nil,