remove delegate

in favor of SwiftUI style for state changes

Example/VLCUIExample/Shared/ContentView.swift

@@ -9,7 +9,15 @@ struct ContentView: View {
     var body: some View {
         ZStack(alignment: .bottom) {
             VLCVideoPlayer(configuration: viewModel.configuration)
-                .delegate(viewModel)
+                .eventSubject(viewModel.eventSubject)
+                .onTicksUpdated { ticks, playbackInformation in
+                    viewModel.ticks = ticks
+                    viewModel.totalTicks = playbackInformation.length
+                    viewModel.position = playbackInformation.position
+                }
+                .onStateUpdated { state, _ in
+                    viewModel.playerState = state
+                }
 
             OverlayView(viewModel: viewModel)
                 .padding()

Example/VLCUIExample/Shared/ContentViewModel.swift

@@ -2,7 +2,7 @@ import Combine
 import Foundation
 import VLCUI
 
-class ContentViewModel: ObservableObject, VLCVideoPlayerDelegate {
+class ContentViewModel: ObservableObject {
 
     @Published
     var ticks: Int32 = 0
@@ -33,19 +33,4 @@ class ContentViewModel: ObservableObject, VLCVideoPlayerDelegate {
     func setCustomPosition(_ position: Float) {
         self.position = position
     }
-
-    func vlcVideoPlayer(didUpdateTicks ticks: Int32, with playbackInformation: VLCVideoPlayer.PlaybackInformation) {
-        self.ticks = ticks
-        self.position = playbackInformation.position
-
-        self.totalTicks = playbackInformation.length
-    }
-
-    func vlcVideoPlayer(didUpdateState state: VLCVideoPlayer.State, with playbackInformation: VLCVideoPlayer.PlaybackInformation) {
-        self.playerState = state
-
-        if state == .error {
-            print("An error has occurred")
-        }
-    }
 }

Example/VLCUIExample/VLCUIExample.xcodeproj/project.pbxproj

@@ -618,7 +618,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "";
-				DEVELOPMENT_TEAM = TY84JMYEFE;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -651,7 +651,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "";
-				DEVELOPMENT_TEAM = TY84JMYEFE;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;

Sources/VLCUI/UIVLCVideoPlayerView.swift

@@ -23,7 +23,9 @@ public class UIVLCVideoPlayerView: _PlatformView {
     private lazy var videoContentView = makeVideoContentView()
 
     private var startConfiguration: VLCVideoPlayer.Configuration
-    private let delegate: VLCVideoPlayerDelegate
+    private let eventSubject: CurrentValueSubject<VLCVideoPlayer.Event?, Never>
+    private let onTicksUpdated: (Int32, VLCVideoPlayer.PlaybackInformation) -> Void
+    private let onStateUpdated: (VLCVideoPlayer.State, VLCVideoPlayer.PlaybackInformation) -> Void
     private let logger: VLCVideoPlayerLogger
     private var currentMediaPlayer: VLCMediaPlayer?
 
@@ -41,11 +43,15 @@ public class UIVLCVideoPlayerView: _PlatformView {
 
     init(
         configuration: VLCVideoPlayer.Configuration,
-        delegate: VLCVideoPlayerDelegate,
+        eventSubject: CurrentValueSubject<VLCVideoPlayer.Event?, Never>,
+        onTicksUpdated: @escaping (Int32, VLCVideoPlayer.PlaybackInformation) -> Void,
+        onStateUpdated: @escaping (VLCVideoPlayer.State, VLCVideoPlayer.PlaybackInformation) -> Void,
         logger: VLCVideoPlayerLogger
     ) {
         self.startConfiguration = configuration
-        self.delegate = delegate
+        self.eventSubject = eventSubject
+        self.onTicksUpdated = onTicksUpdated
+        self.onStateUpdated = onStateUpdated
         self.logger = logger
         super.init(frame: .zero)
 
@@ -125,7 +131,7 @@ public class UIVLCVideoPlayerView: _PlatformView {
 public extension UIVLCVideoPlayerView {
 
     func setupEventSubjectListener() {
-        delegate.eventSubject.sink { event in
+        eventSubject.sink { event in
             guard let event = event,
                   let currentMediaPlayer = self.currentMediaPlayer,
                   let media = currentMediaPlayer.media else { return }
@@ -232,16 +238,13 @@ extension UIVLCVideoPlayerView: VLCMediaPlayerDelegate {
         let currentTicks = player.time.intValue
         let playbackInformation = constructPlaybackInformation(player: player, media: player.media!)
 
-        delegate.vlcVideoPlayer(
-            didUpdateTicks: currentTicks,
-            with: playbackInformation
-        )
+        onTicksUpdated(currentTicks, playbackInformation)
 
         // Set playing state
         if lastPlayerState != .playing,
            abs(currentTicks - lastPlayerTicks) >= 200
         {
-            delegate.vlcVideoPlayer(didUpdateState: .playing, with: playbackInformation)
+            onStateUpdated(.playing, playbackInformation)
             lastPlayerState = .playing
             lastPlayerTicks = currentTicks
 
@@ -269,7 +272,7 @@ extension UIVLCVideoPlayerView: VLCMediaPlayerDelegate {
         let wrappedState = VLCVideoPlayer.State(rawValue: player.state.rawValue) ?? .error
         let playbackInformation = constructPlaybackInformation(player: player, media: player.media!)
 
-        delegate.vlcVideoPlayer(didUpdateState: wrappedState, with: playbackInformation)
+        onStateUpdated(wrappedState, playbackInformation)
         lastPlayerState = player.state
     }
 

Sources/VLCUI/VLCVideoPlayer/VLCVideoPlayer.swift

@@ -1,12 +1,13 @@
+import Combine
 import Foundation
 import SwiftUI
 
 public struct VLCVideoPlayer: _PlatformRepresentable {
 
-    // MARK: Implementation
-
     private var configuration: VLCVideoPlayer.Configuration
-    private var delegate: VLCVideoPlayerDelegate
+    private var eventSubject: CurrentValueSubject<VLCVideoPlayer.Event?, Never>
+    private var onTicksUpdated: (Int32, VLCVideoPlayer.PlaybackInformation) -> Void
+    private var onStateUpdated: (VLCVideoPlayer.State, VLCVideoPlayer.PlaybackInformation) -> Void
     private var logger: VLCVideoPlayerLogger
 
     #if os(macOS)
@@ -26,7 +27,9 @@ public struct VLCVideoPlayer: _PlatformRepresentable {
     private func makeVideoPlayerView() -> UIVLCVideoPlayerView {
         UIVLCVideoPlayerView(
             configuration: configuration,
-            delegate: delegate,
+            eventSubject: eventSubject,
+            onTicksUpdated: onTicksUpdated,
+            onStateUpdated: onStateUpdated,
             logger: logger
         )
     }
@@ -36,7 +39,9 @@ public extension VLCVideoPlayer {
 
     init(configuration: VLCVideoPlayer.Configuration) {
         self.configuration = configuration
-        self.delegate = DefaultVideoPlayerDelegate()
+        self.eventSubject = .init(nil)
+        self.onTicksUpdated = { _, _ in }
+        self.onStateUpdated = { _, _ in }
         self.logger = DefaultVideoPlayerLogger()
     }
 
@@ -48,9 +53,24 @@ public extension VLCVideoPlayer {
         self.init(configuration: configure())
     }
 
-    func delegate(_ delegate: VLCVideoPlayerDelegate) -> Self {
+    /// Sets the event subject for subscribing to player command events
+    func eventSubject(_ eventSubject: CurrentValueSubject<VLCVideoPlayer.Event?, Never>) -> Self {
+        var copy = self
+        copy.eventSubject = eventSubject
+        return copy
+    }
+
+    /// Sets the action that fires when the media ticks have been updated
+    func onTicksUpdated(_ action: @escaping (Int32, VLCVideoPlayer.PlaybackInformation) -> Void) -> Self {
+        var copy = self
+        copy.onTicksUpdated = action
+        return copy
+    }
+
+    /// Sets the action that fires when the media state has been updated
+    func onStateUpdated(_ action: @escaping (VLCVideoPlayer.State, VLCVideoPlayer.PlaybackInformation) -> Void) -> Self {
         var copy = self
-        copy.delegate = delegate
+        copy.onStateUpdated = action
         return copy
     }