strip unused code

ronnyf · Nov 16, 2023 · fabc152 · fabc152
1 parent 6b1aff5
commit fabc152
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 191 deletions.
diff --git a/Sources/LiveKit/Core/Engine.swift b/Sources/LiveKit/Core/Engine.swift
@@ -23,13 +23,11 @@ import Foundation
 @_implementationOnly import WebRTC
 
 class Engine: MulticastDelegate<EngineDelegate> {
-    let queue = DispatchQueue(label: "LiveKitSDK.engine", qos: .default)
-
     // MARK: - Public
 
     public typealias ConditionEvalFunc = (_ newState: State, _ oldState: State?) -> Bool
 
-    struct State: ReconnectableState, Equatable {
+    struct State: Equatable {
         var connectOptions: ConnectOptions
         var url: String?
         var token: String?
@@ -62,13 +60,12 @@ class Engine: MulticastDelegate<EngineDelegate> {
         let block: () -> Void
     }
 
-    var subscriberPrimary: Bool = false
-    private var primary: Transport? { subscriberPrimary ? subscriber : publisher }
+    public internal(set) var subscriberPrimary: Bool = false
 
     // MARK: - DataChannels
 
-    var subscriberDC = DataChannelPair(target: .subscriber)
-    var publisherDC = DataChannelPair(target: .publisher)
+    public internal(set) var subscriberDC = DataChannelPair(target: .subscriber)
+    public internal(set) var publisherDC = DataChannelPair(target: .publisher)
 
     private var _blockProcessQueue = DispatchQueue(label: "LiveKitSDK.engine.pendingBlocks",
                                                    qos: .default)

diff --git a/Sources/LiveKit/Core/Room.swift b/Sources/LiveKit/Core/Room.swift
@@ -24,9 +24,7 @@ import Foundation
 public class Room: NSObject, ObservableObject, Loggable {
     // MARK: - MulticastDelegate
 
-    var delegates = MulticastDelegate<RoomDelegateObjC>()
-
-    let queue = DispatchQueue(label: "LiveKitSDK.room", qos: .default)
+    public let delegates = MulticastDelegate<RoomDelegateObjC>()
 
     // MARK: - Public
 

diff --git a/Sources/LiveKit/Core/SignalClient.swift b/Sources/LiveKit/Core/SignalClient.swift
@@ -35,8 +35,7 @@ class SignalClient: MulticastDelegate<SignalClientDelegate> {
     let joinResponseCompleter = AsyncCompleter<Livekit_JoinResponse>(label: "Join response", timeOut: .defaultJoinResponse)
     let _addTrackCompleters = CompleterMapActor<Livekit_TrackInfo>(label: "Completers for add track", timeOut: .defaultPublish)
 
-    struct State: ReconnectableState, Equatable {
-        var reconnectMode: ReconnectMode?
+    struct State: Equatable {
         var connectionState: ConnectionState = .disconnected()
     }
 
@@ -99,7 +98,7 @@ class SignalClient: MulticastDelegate<SignalClientDelegate> {
         log("Connecting with url: \(urlString)")
 
         _state.mutate {
-            $0.reconnectMode = reconnectMode
+            // $0.reconnectMode = reconnectMode
             $0.connectionState = .connecting
         }
 

diff --git a/Sources/LiveKit/Extensions/Logger.swift b/Sources/LiveKit/Extensions/Logger.swift
@@ -20,8 +20,6 @@ import Logging
 /// Allows to extend with custom `log` method which automatically captures current type (class name).
 public protocol Loggable {}
 
-private var _scopedMetadataKey = "scopedMetadata"
-
 public typealias ScopedMetadata = CustomStringConvertible
 typealias ScopedMetadataContainer = [String: ScopedMetadata]
 

diff --git a/Sources/LiveKit/Participant/Participant.swift b/Sources/LiveKit/Participant/Participant.swift
@@ -22,9 +22,7 @@ import Foundation
 public class Participant: NSObject, ObservableObject, Loggable {
     // MARK: - MulticastDelegate
 
-    var delegates = MulticastDelegate<ParticipantDelegate>()
-
-    let queue = DispatchQueue(label: "LiveKitSDK.participant", qos: .default)
+    public let delegates = MulticastDelegate<ParticipantDelegate>()
 
     /// This will be an empty String for LocalParticipants until connected.
     @objc

diff --git a/Sources/LiveKit/Support/DisplayLink.swift b/Sources/LiveKit/Support/DisplayLink.swift
diff --git a/Sources/LiveKit/Track/Capturers/VideoCapturer.swift b/Sources/LiveKit/Track/Capturers/VideoCapturer.swift
@@ -41,9 +41,7 @@ public protocol VideoCapturerDelegate: AnyObject {
 public class VideoCapturer: NSObject, Loggable, VideoCapturerProtocol {
     // MARK: - MulticastDelegate
 
-    var delegates = MulticastDelegate<VideoCapturerDelegate>()
-
-    let queue = DispatchQueue(label: "LiveKitSDK.videoCapturer", qos: .default)
+    public let delegates = MulticastDelegate<VideoCapturerDelegate>()
 
     /// Array of supported pixel formats that can be used to capture a frame.
     ///

diff --git a/Sources/LiveKit/Track/Track.swift b/Sources/LiveKit/Track/Track.swift
@@ -96,9 +96,7 @@ public class Track: NSObject, Loggable {
 
     // MARK: - Internal
 
-    var delegates = MulticastDelegate<TrackDelegate>()
-
-    let queue = DispatchQueue(label: "LiveKitSDK.track", qos: .default)
+    public let delegates = MulticastDelegate<TrackDelegate>()
 
     /// Only for ``LocalTrack``s.
     private(set) var _publishState: PublishState = .unpublished

diff --git a/Sources/LiveKit/Types/ConnectionState.swift b/Sources/LiveKit/Types/ConnectionState.swift
@@ -77,8 +77,3 @@ extension ConnectionState: Equatable {
         return error
     }
 }
-
-protocol ReconnectableState {
-    var reconnectMode: ReconnectMode? { get }
-    var connectionState: ConnectionState { get }
-}
diff --git a/Sources/LiveKit/Types/Dimensions.swift b/Sources/LiveKit/Types/Dimensions.swift
@@ -88,10 +88,6 @@ extension Dimensions {
         Swift.max(width, height)
     }
 
-    var sum: Int32 {
-        width + height
-    }
-
     // TODO: Find better name
     var area: Int32 {
         width * height
@@ -155,17 +151,6 @@ extension Dimensions {
         return VideoQuality.rids.compactMap { rid in result.first(where: { $0.rid == rid }) }
     }
 
-    func computeSuggestedPresetIndex(in presets: [VideoParameters]) -> Int {
-        assert(!presets.isEmpty)
-        var result = 0
-        for preset in presets {
-            if width >= preset.dimensions.width, height >= preset.dimensions.height {
-                result += 1
-            }
-        }
-        return result
-    }
-
     func videoLayers(for encodings: [LKRTCRtpEncodingParameters]) -> [Livekit_VideoLayer] {
         encodings.filter(\.isActive).map { encoding in
             let scaleDownBy = encoding.scaleResolutionDownBy?.doubleValue ?? 1.0
@@ -182,10 +167,6 @@ extension Dimensions {
 // MARK: - Convert
 
 extension Dimensions {
-    func toCGSize() -> CGSize {
-        CGSize(width: Int(width), height: Int(height))
-    }
-
     func apply(rotation: RTCVideoRotation) -> Dimensions {
         if rotation == ._90 || rotation == ._270 {
             return swapped()

diff --git a/Sources/LiveKit/Types/VideoQuality.swift b/Sources/LiveKit/Types/VideoQuality.swift
@@ -39,16 +39,6 @@ extension VideoQuality {
 }
 
 extension Livekit_VideoQuality {
-    private static let toSDKTypeMap: [Livekit_VideoQuality: VideoQuality] = [
-        .low: .low,
-        .medium: .medium,
-        .high: .high,
-    ]
-
-    func toSDKType() -> VideoQuality {
-        Self.toSDKTypeMap[self] ?? .low
-    }
-
     static func from(rid: String?) -> Livekit_VideoQuality {
         switch rid {
         case "h": return Livekit_VideoQuality.medium

diff --git a/Sources/LiveKit/Views/VideoView.swift b/Sources/LiveKit/Views/VideoView.swift
@@ -30,7 +30,7 @@ protocol Mirrorable {
 public class VideoView: NativeView, Loggable {
     // MARK: - MulticastDelegate
 
-    var delegates = MulticastDelegate<VideoViewDelegate>()
+    public let delegates = MulticastDelegate<VideoViewDelegate>()
 
     // MARK: - Static