react-native-theoplayer 11.4.1 → 11.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +26 -1
- package/README.md +1 -0
- package/android/src/main/java/com/theoplayer/PlayerEventEmitter.kt +21 -0
- package/android/src/main/java/com/theoplayer/ReactTHEOplayerContext.kt +58 -85
- package/android/src/main/java/com/theoplayer/ReactTHEOplayerPackage.kt +3 -0
- package/android/src/main/java/com/theoplayer/media/MediaControlModule.kt +102 -0
- package/android/src/main/java/com/theoplayer/media/MediaControlProxy.kt +376 -0
- package/android/src/main/java/com/theoplayer/media/MediaNotificationBuilder.kt +78 -34
- package/android/src/main/java/com/theoplayer/media/MediaPlaybackService.kt +53 -20
- package/android/src/main/java/com/theoplayer/media/MediaSessionConfig.kt +6 -6
- package/android/src/main/java/com/theoplayer/media/MediaSessionConfigAdapter.kt +23 -20
- package/android/src/main/java/com/theoplayer/player/PlayerModule.kt +0 -1
- package/android/src/main/java/com/theoplayer/presentation/PipUtils.kt +98 -93
- package/android/src/main/java/com/theoplayer/util/ReadableExtension.kt +14 -0
- package/android/src/main/res/drawable/ic_next.xml +9 -0
- package/android/src/main/res/drawable/ic_prev.xml +9 -0
- package/android/src/main/res/values/strings.xml +4 -0
- package/ios/RCTBridgeModule+ViewHelpers.swift +59 -0
- package/ios/THEOplayerRCTBridge.m +17 -0
- package/ios/THEOplayerRCTDebug.swift +3 -0
- package/ios/THEOplayerRCTMainEventHandler.swift +18 -0
- package/ios/THEOplayerRCTPlayerAPI.swift +194 -254
- package/ios/THEOplayerRCTTypeUtils.swift +30 -0
- package/ios/THEOplayerRCTView.swift +22 -6
- package/ios/ads/THEOplayerRCTAdsAPI+DAI.swift +22 -21
- package/ios/ads/THEOplayerRCTAdsAPI+Omid.swift +4 -9
- package/ios/ads/THEOplayerRCTAdsAPI.swift +39 -50
- package/ios/backgroundAudio/THEOplayerRCTBackgroundAudioManager.swift +2 -2
- package/ios/backgroundAudio/THEOplayerRCTNowPlayingManager.swift +144 -47
- package/ios/backgroundAudio/THEOplayerRCTRemoteCommandsManager.swift +151 -68
- package/ios/backgroundAudio/THEOplayerRCTView+MediaControlConfig.swift +25 -11
- package/ios/casting/THEOplayerRCTCastAPI+Airplay.swift +20 -22
- package/ios/casting/THEOplayerRCTCastAPI+Chromecast.swift +28 -34
- package/ios/casting/THEOplayerRCTCastAPI.swift +5 -8
- package/ios/eventBroadcasting/THEOplayerRCTEventBroadcastAPI.swift +2 -4
- package/ios/mediaControl/THEOplayerRCTMediaControlAPI.swift +79 -0
- package/ios/mediaControl/THEOplayerRCTMediaControlManager.swift +38 -0
- package/ios/pip/THEOplayerRCTPipControlsManager.swift +9 -12
- package/ios/theoAds/THEOplayerRCTTHEOAdsAPI.swift +16 -18
- package/ios/theolive/THEOplayerRCTTHEOliveAPI.swift +14 -14
- package/lib/commonjs/api/error/ContentProtectionError.js +2 -0
- package/lib/commonjs/api/error/ContentProtectionError.js.map +1 -0
- package/lib/commonjs/api/error/barrel.js +11 -0
- package/lib/commonjs/api/error/barrel.js.map +1 -1
- package/lib/commonjs/api/event/PlayerEvent.js +16 -0
- package/lib/commonjs/api/event/PlayerEvent.js.map +1 -1
- package/lib/commonjs/api/media/MediaControlAPI.js +14 -0
- package/lib/commonjs/api/media/MediaControlAPI.js.map +1 -0
- package/lib/commonjs/api/media/barrel.js +11 -0
- package/lib/commonjs/api/media/barrel.js.map +1 -1
- package/lib/commonjs/api/player/PlayerEventMap.js +2 -0
- package/lib/commonjs/api/player/PlayerEventMap.js.map +1 -1
- package/lib/commonjs/api/player/THEOplayer.js.map +1 -1
- package/lib/commonjs/internal/THEOplayerView.js +8 -0
- package/lib/commonjs/internal/THEOplayerView.js.map +1 -1
- package/lib/commonjs/internal/adapter/THEOplayerAdapter.js +6 -0
- package/lib/commonjs/internal/adapter/THEOplayerAdapter.js.map +1 -1
- package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js +9 -9
- package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
- package/lib/commonjs/internal/adapter/WebEventForwarder.js +27 -0
- package/lib/commonjs/internal/adapter/WebEventForwarder.js.map +1 -1
- package/lib/commonjs/internal/adapter/event/PlayerEvents.js +14 -1
- package/lib/commonjs/internal/adapter/event/PlayerEvents.js.map +1 -1
- package/lib/commonjs/internal/adapter/media/MediaControlNativeAdapter.js +42 -0
- package/lib/commonjs/internal/adapter/media/MediaControlNativeAdapter.js.map +1 -0
- package/lib/commonjs/internal/adapter/media/MediaControlWebAdapter.js +32 -0
- package/lib/commonjs/internal/adapter/media/MediaControlWebAdapter.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/WebMediaSession.js +78 -16
- package/lib/commonjs/internal/adapter/web/WebMediaSession.js.map +1 -1
- package/lib/commonjs/manifest.json +1 -1
- package/lib/module/api/error/ContentProtectionError.js +2 -0
- package/lib/module/api/error/ContentProtectionError.js.map +1 -0
- package/lib/module/api/error/barrel.js +1 -0
- package/lib/module/api/error/barrel.js.map +1 -1
- package/lib/module/api/event/PlayerEvent.js +18 -0
- package/lib/module/api/event/PlayerEvent.js.map +1 -1
- package/lib/module/api/media/MediaControlAPI.js +10 -0
- package/lib/module/api/media/MediaControlAPI.js.map +1 -0
- package/lib/module/api/media/barrel.js +1 -0
- package/lib/module/api/media/barrel.js.map +1 -1
- package/lib/module/api/player/PlayerEventMap.js +2 -0
- package/lib/module/api/player/PlayerEventMap.js.map +1 -1
- package/lib/module/api/player/THEOplayer.js.map +1 -1
- package/lib/module/internal/THEOplayerView.js +9 -1
- package/lib/module/internal/THEOplayerView.js.map +1 -1
- package/lib/module/internal/adapter/THEOplayerAdapter.js +6 -0
- package/lib/module/internal/adapter/THEOplayerAdapter.js.map +1 -1
- package/lib/module/internal/adapter/THEOplayerWebAdapter.js +9 -9
- package/lib/module/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
- package/lib/module/internal/adapter/WebEventForwarder.js +28 -1
- package/lib/module/internal/adapter/WebEventForwarder.js.map +1 -1
- package/lib/module/internal/adapter/event/PlayerEvents.js +11 -0
- package/lib/module/internal/adapter/event/PlayerEvents.js.map +1 -1
- package/lib/module/internal/adapter/media/MediaControlNativeAdapter.js +37 -0
- package/lib/module/internal/adapter/media/MediaControlNativeAdapter.js.map +1 -0
- package/lib/module/internal/adapter/media/MediaControlWebAdapter.js +27 -0
- package/lib/module/internal/adapter/media/MediaControlWebAdapter.js.map +1 -0
- package/lib/module/internal/adapter/web/WebMediaSession.js +78 -16
- package/lib/module/internal/adapter/web/WebMediaSession.js.map +1 -1
- package/lib/module/manifest.json +1 -1
- package/lib/typescript/api/error/ContentProtectionError.d.ts +53 -0
- package/lib/typescript/api/error/ContentProtectionError.d.ts.map +1 -0
- package/lib/typescript/api/error/barrel.d.ts +1 -0
- package/lib/typescript/api/error/barrel.d.ts.map +1 -1
- package/lib/typescript/api/event/PlayerEvent.d.ts +24 -1
- package/lib/typescript/api/event/PlayerEvent.d.ts.map +1 -1
- package/lib/typescript/api/media/MediaControlAPI.d.ts +30 -0
- package/lib/typescript/api/media/MediaControlAPI.d.ts.map +1 -0
- package/lib/typescript/api/media/MediaControlConfiguration.d.ts +5 -1
- package/lib/typescript/api/media/MediaControlConfiguration.d.ts.map +1 -1
- package/lib/typescript/api/media/barrel.d.ts +1 -0
- package/lib/typescript/api/media/barrel.d.ts.map +1 -1
- package/lib/typescript/api/player/PlayerEventMap.d.ts +12 -2
- package/lib/typescript/api/player/PlayerEventMap.d.ts.map +1 -1
- package/lib/typescript/api/player/THEOplayer.d.ts +5 -0
- package/lib/typescript/api/player/THEOplayer.d.ts.map +1 -1
- package/lib/typescript/internal/THEOplayerView.d.ts +2 -0
- package/lib/typescript/internal/THEOplayerView.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts +3 -1
- package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts +3 -2
- package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/WebEventForwarder.d.ts +2 -0
- package/lib/typescript/internal/adapter/WebEventForwarder.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/event/PlayerEvents.d.ts +8 -1
- package/lib/typescript/internal/adapter/event/PlayerEvents.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/event/native/NativePlayerEvent.d.ts +5 -1
- package/lib/typescript/internal/adapter/event/native/NativePlayerEvent.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/media/MediaControlNativeAdapter.d.ts +12 -0
- package/lib/typescript/internal/adapter/media/MediaControlNativeAdapter.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/media/MediaControlWebAdapter.d.ts +14 -0
- package/lib/typescript/internal/adapter/media/MediaControlWebAdapter.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/WebMediaSession.d.ts +10 -3
- package/lib/typescript/internal/adapter/web/WebMediaSession.d.ts.map +1 -1
- package/package.json +3 -3
- package/react-native-theoplayer.podspec +1 -1
- package/src/api/error/ContentProtectionError.ts +58 -0
- package/src/api/error/barrel.ts +1 -0
- package/src/api/event/PlayerEvent.ts +26 -1
- package/src/api/media/MediaControlAPI.ts +33 -0
- package/src/api/media/MediaControlConfiguration.ts +5 -1
- package/src/api/media/barrel.ts +1 -0
- package/src/api/player/PlayerEventMap.ts +14 -0
- package/src/api/player/THEOplayer.ts +6 -0
- package/src/internal/THEOplayerView.tsx +16 -0
- package/src/internal/adapter/THEOplayerAdapter.ts +9 -0
- package/src/internal/adapter/THEOplayerWebAdapter.ts +12 -9
- package/src/internal/adapter/WebEventForwarder.ts +26 -0
- package/src/internal/adapter/event/PlayerEvents.ts +18 -0
- package/src/internal/adapter/event/native/NativePlayerEvent.ts +7 -0
- package/src/internal/adapter/media/MediaControlNativeAdapter.ts +38 -0
- package/src/internal/adapter/media/MediaControlWebAdapter.ts +28 -0
- package/src/internal/adapter/web/WebMediaSession.ts +85 -21
- package/src/manifest.json +1 -1
- package/android/src/main/java/com/theoplayer/media/MediaQueueNavigator.kt +0 -33
|
@@ -7,10 +7,11 @@ import MediaPlayer
|
|
|
7
7
|
class THEOplayerRCTRemoteCommandsManager: NSObject {
|
|
8
8
|
// MARK: Members
|
|
9
9
|
private weak var player: THEOplayer?
|
|
10
|
+
private weak var view: THEOplayerRCTView?
|
|
10
11
|
private var isLive: Bool = false
|
|
11
12
|
private var inAd: Bool = false
|
|
12
13
|
private var hasSource: Bool = false
|
|
13
|
-
private var
|
|
14
|
+
private var commandsRegistered: Bool = false
|
|
14
15
|
|
|
15
16
|
// MARK: player Listeners
|
|
16
17
|
private var durationChangeListener: EventListener?
|
|
@@ -18,98 +19,168 @@ class THEOplayerRCTRemoteCommandsManager: NSObject {
|
|
|
18
19
|
private var adBreakBeginListener: EventListener?
|
|
19
20
|
private var adBreakEndListener: EventListener?
|
|
20
21
|
|
|
22
|
+
// MARK: computed
|
|
23
|
+
private var mediaSessionEnabled: Bool {
|
|
24
|
+
self.view?.mediaControlConfig.mediaSessionEnabled ?? DEFAULT_MEDIA_SESSION_ENABLED
|
|
25
|
+
}
|
|
26
|
+
private var seekToLiveOnResume: Bool {
|
|
27
|
+
self.view?.mediaControlConfig.seekToLiveOnResume ?? DEFAULT_SEEK_TO_LIVE_ON_RESUME
|
|
28
|
+
}
|
|
29
|
+
private var skipForwardInterval: NSNumber {
|
|
30
|
+
NSNumber(value: self.view?.mediaControlConfig.skipForwardInterval ?? DEFAULT_SKIP_INTERVAL)
|
|
31
|
+
}
|
|
32
|
+
private var skipBackwardInterval: NSNumber {
|
|
33
|
+
NSNumber(value: self.view?.mediaControlConfig.skipBackwardInterval ?? DEFAULT_SKIP_INTERVAL)
|
|
34
|
+
}
|
|
35
|
+
private var allowLivePlayPause: Bool {
|
|
36
|
+
self.view?.mediaControlConfig.allowLivePlayPause ?? DEFAULT_ALLOW_LIVE_PLAY_PAUSE
|
|
37
|
+
}
|
|
38
|
+
|
|
21
39
|
// MARK: - destruction
|
|
22
40
|
func destroy() {
|
|
23
41
|
// dettach listeners
|
|
24
42
|
self.dettachListeners()
|
|
43
|
+
// remove our targets from the shared command center
|
|
44
|
+
self.removeCommandTargets()
|
|
25
45
|
}
|
|
26
46
|
|
|
27
47
|
// MARK: - player setup / breakdown
|
|
28
|
-
func setPlayer(_ player: THEOplayer) {
|
|
48
|
+
func setPlayer(_ player: THEOplayer, view: THEOplayerRCTView?) {
|
|
29
49
|
self.player = player;
|
|
50
|
+
self.view = view;
|
|
30
51
|
self.initRemoteCommands()
|
|
31
52
|
|
|
32
53
|
// attach listeners
|
|
33
54
|
self.attachListeners()
|
|
34
55
|
}
|
|
35
56
|
|
|
36
|
-
func setMediaControlConfig(_ newMediaControlConfig: MediaControlConfig) {
|
|
37
|
-
self.mediaControlConfig = newMediaControlConfig
|
|
38
|
-
self.updateRemoteCommands()
|
|
39
|
-
}
|
|
40
|
-
|
|
41
57
|
private func initRemoteCommands() {
|
|
42
58
|
self.isLive = false
|
|
43
59
|
self.inAd = false
|
|
44
60
|
self.hasSource = false
|
|
61
|
+
// Register/deregister targets and apply the correct enabled state based on the current config.
|
|
62
|
+
// Note: MPRemoteCommandCenter is a process-wide singleton shared by all player instances, so we
|
|
63
|
+
// must not touch its state here for a player that doesn't own the media session.
|
|
64
|
+
self.updateRemoteCommands()
|
|
65
|
+
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Remote commands initialised.") }
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
private func addCommandTargets() {
|
|
69
|
+
guard !self.commandsRegistered else { return }
|
|
45
70
|
let commandCenter = MPRemoteCommandCenter.shared()
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
commandCenter.togglePlayPauseCommand.isEnabled = false
|
|
50
|
-
commandCenter.stopCommand.isEnabled = false
|
|
51
|
-
commandCenter.changePlaybackPositionCommand.isEnabled = false
|
|
52
|
-
commandCenter.skipForwardCommand.isEnabled = false
|
|
53
|
-
commandCenter.skipBackwardCommand.isEnabled = false
|
|
54
|
-
commandCenter.previousTrackCommand.isEnabled = false
|
|
55
|
-
commandCenter.nextTrackCommand.isEnabled = false
|
|
56
|
-
|
|
57
|
-
// PLAY
|
|
58
|
-
commandCenter.playCommand.addTarget(self, action: #selector(onPlayCommand(_:)))
|
|
59
|
-
// PAUSE
|
|
60
|
-
commandCenter.pauseCommand.addTarget(self, action: #selector(onPauseCommand(_:)))
|
|
61
|
-
// PLAY/PAUSE
|
|
62
|
-
commandCenter.togglePlayPauseCommand.addTarget(self, action: #selector(onTogglePlayPauseCommand(_:)))
|
|
71
|
+
// NOTE: play/pause/togglePlayPause are (re)registered separately via reclaimPlayPauseCommands(),
|
|
72
|
+
// because the THEOplayer SDK adds its own play/pause targets to every player instance and we must
|
|
73
|
+
// strip those to keep remote play/pause scoped to the active player only.
|
|
63
74
|
// STOP
|
|
64
75
|
commandCenter.stopCommand.addTarget(self, action: #selector(onStopCommand(_:)))
|
|
65
76
|
// SCRUBBER
|
|
66
77
|
commandCenter.changePlaybackPositionCommand.addTarget(self, action: #selector(onScrubCommand(_:)))
|
|
67
|
-
//
|
|
68
|
-
commandCenter.skipForwardCommand.preferredIntervals = [NSNumber(value: self.mediaControlConfig.skipForwardInterval)]
|
|
78
|
+
// SEEK FORWARD
|
|
69
79
|
commandCenter.skipForwardCommand.addTarget(self, action: #selector(onSkipForwardCommand(_:)))
|
|
70
|
-
//
|
|
71
|
-
commandCenter.skipBackwardCommand.preferredIntervals = [NSNumber(value: self.mediaControlConfig.skipBackwardInterval)]
|
|
80
|
+
// SEEK BACKWARD
|
|
72
81
|
commandCenter.skipBackwardCommand.addTarget(self, action: #selector(onSkipBackwardCommand(_:)))
|
|
73
|
-
//
|
|
82
|
+
// NEXT TRACK
|
|
74
83
|
commandCenter.nextTrackCommand.addTarget(self, action: #selector(onNextTrackCommand(_:)))
|
|
75
|
-
//
|
|
84
|
+
// PREVIOUS TRACK
|
|
76
85
|
commandCenter.previousTrackCommand.addTarget(self, action: #selector(onPreviousTrackCommand(_:)))
|
|
77
|
-
|
|
78
|
-
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Remote
|
|
86
|
+
self.commandsRegistered = true
|
|
87
|
+
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Remote command targets added.") }
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
/// Take exclusive ownership of the play/pause/togglePlayPause remote commands.
|
|
91
|
+
///
|
|
92
|
+
/// The THEOplayer SDK registers its own play/pause handlers on the shared MPRemoteCommandCenter for
|
|
93
|
+
/// EVERY player instance at creation (via initAudioSession -> setupRemoteTransportControls). With
|
|
94
|
+
/// multiple players this makes a single remote play/pause control all instances. We therefore remove
|
|
95
|
+
/// all targets (SDK's and any stale ones) and re-add only this active player's handlers.
|
|
96
|
+
private func reclaimPlayPauseCommands() {
|
|
97
|
+
let commandCenter = MPRemoteCommandCenter.shared()
|
|
98
|
+
commandCenter.playCommand.removeTarget(nil)
|
|
99
|
+
commandCenter.pauseCommand.removeTarget(nil)
|
|
100
|
+
commandCenter.togglePlayPauseCommand.removeTarget(nil)
|
|
101
|
+
commandCenter.playCommand.addTarget(self, action: #selector(onPlayCommand(_:)))
|
|
102
|
+
commandCenter.pauseCommand.addTarget(self, action: #selector(onPauseCommand(_:)))
|
|
103
|
+
commandCenter.togglePlayPauseCommand.addTarget(self, action: #selector(onTogglePlayPauseCommand(_:)))
|
|
104
|
+
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Reclaimed play/pause commands from SDK for active player.") }
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
private func removeCommandTargets() {
|
|
108
|
+
guard self.commandsRegistered else { return }
|
|
109
|
+
let commandCenter = MPRemoteCommandCenter.shared()
|
|
110
|
+
commandCenter.playCommand.removeTarget(self)
|
|
111
|
+
commandCenter.pauseCommand.removeTarget(self)
|
|
112
|
+
commandCenter.togglePlayPauseCommand.removeTarget(self)
|
|
113
|
+
commandCenter.stopCommand.removeTarget(self)
|
|
114
|
+
commandCenter.changePlaybackPositionCommand.removeTarget(self)
|
|
115
|
+
commandCenter.skipForwardCommand.removeTarget(self)
|
|
116
|
+
commandCenter.skipBackwardCommand.removeTarget(self)
|
|
117
|
+
commandCenter.nextTrackCommand.removeTarget(self)
|
|
118
|
+
commandCenter.previousTrackCommand.removeTarget(self)
|
|
119
|
+
self.commandsRegistered = false
|
|
120
|
+
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Remote command targets removed.") }
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
private func hasActionHandler(for action: MediaControlAction) -> Bool {
|
|
124
|
+
return self.view?.mediaControlManager.hasMediaControlActionHandler(for: action) ?? false
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
private func executeAction(for action: MediaControlAction) -> Bool {
|
|
128
|
+
return self.view?.mediaControlManager.executeMediaControlAction(action: action) ?? false
|
|
79
129
|
}
|
|
80
130
|
|
|
81
131
|
func updateRemoteCommands() {
|
|
82
132
|
let commandCenter = MPRemoteCommandCenter.shared()
|
|
83
133
|
|
|
84
|
-
|
|
85
|
-
|
|
134
|
+
// Only the player that owns the media session may participate. When disabled, withdraw this
|
|
135
|
+
// player's command handlers entirely and leave the shared command center untouched so we don't
|
|
136
|
+
// respond to remote commands nor clobber the active player's command state.
|
|
137
|
+
guard self.mediaSessionEnabled else {
|
|
138
|
+
self.removeCommandTargets()
|
|
139
|
+
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Remote commands disabled: withdrew from shared command center.") }
|
|
140
|
+
return
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
// Ensure this player's command handlers are registered on the shared command center.
|
|
144
|
+
self.addCommandTargets()
|
|
145
|
+
// Take play/pause ownership away from the SDK's per-instance handlers so remote play/pause only
|
|
146
|
+
// affects this (active) player.
|
|
147
|
+
self.reclaimPlayPauseCommands()
|
|
148
|
+
|
|
149
|
+
let playPauseControlsEnabled = self.hasSource && !self.inAd && (!self.isLive || self.allowLivePlayPause)
|
|
150
|
+
let positionControlEnabled = self.hasSource && !self.inAd && !self.isLive
|
|
151
|
+
let seekControlEnabled = self.hasSource && !self.inAd && !self.isLive && !self.hasActionHandler(for: .SKIP_TO_NEXT) && !self.hasActionHandler(for: .SKIP_TO_PREVIOUS)
|
|
152
|
+
let trackControlEnabled = self.hasActionHandler(for: .SKIP_TO_NEXT) && self.hasActionHandler(for: .SKIP_TO_PREVIOUS)
|
|
86
153
|
|
|
87
154
|
// update the enabled state to have correct visual representation in the lockscreen
|
|
88
155
|
commandCenter.pauseCommand.isEnabled = playPauseControlsEnabled
|
|
89
156
|
commandCenter.playCommand.isEnabled = playPauseControlsEnabled
|
|
90
157
|
commandCenter.togglePlayPauseCommand.isEnabled = playPauseControlsEnabled
|
|
91
158
|
commandCenter.stopCommand.isEnabled = playPauseControlsEnabled
|
|
92
|
-
commandCenter.changePlaybackPositionCommand.isEnabled =
|
|
93
|
-
commandCenter.skipForwardCommand.isEnabled =
|
|
94
|
-
commandCenter.skipBackwardCommand.isEnabled =
|
|
95
|
-
commandCenter.nextTrackCommand.isEnabled =
|
|
96
|
-
commandCenter.previousTrackCommand.isEnabled =
|
|
159
|
+
commandCenter.changePlaybackPositionCommand.isEnabled = positionControlEnabled
|
|
160
|
+
commandCenter.skipForwardCommand.isEnabled = seekControlEnabled
|
|
161
|
+
commandCenter.skipBackwardCommand.isEnabled = seekControlEnabled
|
|
162
|
+
commandCenter.nextTrackCommand.isEnabled = trackControlEnabled
|
|
163
|
+
commandCenter.previousTrackCommand.isEnabled = trackControlEnabled
|
|
97
164
|
|
|
98
165
|
// set configured skip forward/backward intervals
|
|
99
|
-
commandCenter.skipForwardCommand.preferredIntervals = [
|
|
100
|
-
commandCenter.skipBackwardCommand.preferredIntervals = [
|
|
166
|
+
commandCenter.skipForwardCommand.preferredIntervals = [self.skipForwardInterval]
|
|
167
|
+
commandCenter.skipBackwardCommand.preferredIntervals = [self.skipBackwardInterval]
|
|
101
168
|
|
|
102
|
-
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Remote commands updated for \(self.isLive ? "LIVE" : "VOD") (ALLOWLIVEPLAYPAUSE: \(mediaControlConfig.allowLivePlayPause)) (\(self.inAd ? "AD IS PLAYING" : "NO AD PLAYING")).") }
|
|
169
|
+
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Remote commands updated for \(self.isLive ? "LIVE" : "VOD") (ALLOWLIVEPLAYPAUSE: \(self.view?.mediaControlConfig.allowLivePlayPause ?? false)) (\(self.inAd ? "AD IS PLAYING" : "NO AD PLAYING")).") }
|
|
103
170
|
}
|
|
104
171
|
|
|
105
172
|
@objc private func onPlayCommand(_ event: MPRemoteCommandEvent) -> MPRemoteCommandHandlerStatus {
|
|
173
|
+
guard self.mediaSessionEnabled else { return .commandFailed }
|
|
106
174
|
if let player = self.player,
|
|
107
175
|
!self.inAd {
|
|
108
|
-
if self.isLive && self.
|
|
176
|
+
if self.isLive && self.seekToLiveOnResume {
|
|
109
177
|
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Seek to live.") }
|
|
110
178
|
player.currentTime = .infinity
|
|
111
179
|
}
|
|
112
|
-
|
|
180
|
+
if !self.executeAction(for: .PLAY) {
|
|
181
|
+
if DEBUG_MEDIA_CONTROL_API { PrintUtils.printLog(logText: "[NATIVE] Executing default Play action.") }
|
|
182
|
+
player.play()
|
|
183
|
+
}
|
|
113
184
|
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Play command handled.") }
|
|
114
185
|
} else {
|
|
115
186
|
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Play command not handled.") }
|
|
@@ -118,9 +189,13 @@ class THEOplayerRCTRemoteCommandsManager: NSObject {
|
|
|
118
189
|
}
|
|
119
190
|
|
|
120
191
|
@objc private func onPauseCommand(_ event: MPRemoteCommandEvent) -> MPRemoteCommandHandlerStatus {
|
|
192
|
+
guard self.mediaSessionEnabled else { return .commandFailed }
|
|
121
193
|
if let player = self.player,
|
|
122
194
|
!self.inAd {
|
|
123
|
-
|
|
195
|
+
if !self.executeAction(for: .PAUSE) {
|
|
196
|
+
if DEBUG_MEDIA_CONTROL_API { PrintUtils.printLog(logText: "[NATIVE] Executing default Pause action.") }
|
|
197
|
+
player.pause()
|
|
198
|
+
}
|
|
124
199
|
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Pause command handled.") }
|
|
125
200
|
} else {
|
|
126
201
|
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Pause command not handled.") }
|
|
@@ -129,19 +204,26 @@ class THEOplayerRCTRemoteCommandsManager: NSObject {
|
|
|
129
204
|
}
|
|
130
205
|
|
|
131
206
|
@objc private func onTogglePlayPauseCommand(_ event: MPRemoteCommandEvent) -> MPRemoteCommandHandlerStatus {
|
|
207
|
+
guard self.mediaSessionEnabled else { return .commandFailed }
|
|
132
208
|
if let player = self.player,
|
|
133
209
|
!self.inAd {
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
210
|
+
if player.paused {
|
|
211
|
+
if !self.executeAction(for: .PLAY) {
|
|
212
|
+
if DEBUG_MEDIA_CONTROL_API { PrintUtils.printLog(logText: "[NATIVE] Executing default Toogle play action.") }
|
|
213
|
+
if self.isLive && self.seekToLiveOnResume {
|
|
214
|
+
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Seek to live.") }
|
|
215
|
+
player.currentTime = .infinity
|
|
216
|
+
}
|
|
217
|
+
player.play()
|
|
218
|
+
}
|
|
219
|
+
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Toggled to playing.") }
|
|
220
|
+
} else {
|
|
221
|
+
if !self.executeAction(for: .PAUSE) {
|
|
222
|
+
if DEBUG_MEDIA_CONTROL_API { PrintUtils.printLog(logText: "[NATIVE] Executing default Toogle pause action.") }
|
|
223
|
+
player.pause()
|
|
224
|
+
}
|
|
225
|
+
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Toggled to paused.") }
|
|
138
226
|
}
|
|
139
|
-
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Toggled to playing.") }
|
|
140
|
-
player.play()
|
|
141
|
-
} else {
|
|
142
|
-
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Toggled to paused.") }
|
|
143
|
-
player.pause()
|
|
144
|
-
}
|
|
145
227
|
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Toggle play/pause command handled.") }
|
|
146
228
|
} else {
|
|
147
229
|
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Toggle play/pause command not handled.") }
|
|
@@ -150,10 +232,14 @@ class THEOplayerRCTRemoteCommandsManager: NSObject {
|
|
|
150
232
|
}
|
|
151
233
|
|
|
152
234
|
@objc private func onStopCommand(_ event: MPRemoteCommandEvent) -> MPRemoteCommandHandlerStatus {
|
|
235
|
+
guard self.mediaSessionEnabled else { return .commandFailed }
|
|
153
236
|
if let player = self.player,
|
|
154
237
|
!self.inAd {
|
|
155
238
|
if !player.paused {
|
|
156
|
-
|
|
239
|
+
if !self.executeAction(for: .PAUSE) {
|
|
240
|
+
if DEBUG_MEDIA_CONTROL_API { PrintUtils.printLog(logText: "[NATIVE] Executing default Pause action.") }
|
|
241
|
+
player.pause()
|
|
242
|
+
}
|
|
157
243
|
}
|
|
158
244
|
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] Stop command handled.") }
|
|
159
245
|
} else {
|
|
@@ -163,6 +249,7 @@ class THEOplayerRCTRemoteCommandsManager: NSObject {
|
|
|
163
249
|
}
|
|
164
250
|
|
|
165
251
|
@objc private func onScrubCommand(_ event: MPChangePlaybackPositionCommandEvent) -> MPRemoteCommandHandlerStatus {
|
|
252
|
+
guard self.mediaSessionEnabled else { return .commandFailed }
|
|
166
253
|
if let player = self.player,
|
|
167
254
|
!self.isLive,
|
|
168
255
|
!self.inAd {
|
|
@@ -175,6 +262,7 @@ class THEOplayerRCTRemoteCommandsManager: NSObject {
|
|
|
175
262
|
}
|
|
176
263
|
|
|
177
264
|
@objc private func onSkipForwardCommand(_ event: MPSkipIntervalCommandEvent) -> MPRemoteCommandHandlerStatus {
|
|
265
|
+
guard self.mediaSessionEnabled else { return .commandFailed }
|
|
178
266
|
if let player = self.player,
|
|
179
267
|
!self.isLive,
|
|
180
268
|
!self.inAd {
|
|
@@ -187,6 +275,7 @@ class THEOplayerRCTRemoteCommandsManager: NSObject {
|
|
|
187
275
|
}
|
|
188
276
|
|
|
189
277
|
@objc private func onSkipBackwardCommand(_ event: MPSkipIntervalCommandEvent) -> MPRemoteCommandHandlerStatus {
|
|
278
|
+
guard self.mediaSessionEnabled else { return .commandFailed }
|
|
190
279
|
if let player = self.player,
|
|
191
280
|
!self.isLive,
|
|
192
281
|
!self.inAd {
|
|
@@ -199,12 +288,9 @@ class THEOplayerRCTRemoteCommandsManager: NSObject {
|
|
|
199
288
|
}
|
|
200
289
|
|
|
201
290
|
@objc private func onPreviousTrackCommand(_ event: MPRemoteCommandEvent) -> MPRemoteCommandHandlerStatus {
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
!self.inAd {
|
|
206
|
-
player.currentTime = player.currentTime - Double(self.mediaControlConfig.skipBackwardInterval)
|
|
207
|
-
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] previous track command handled as skip backward command.") }
|
|
291
|
+
guard self.mediaSessionEnabled else { return .commandFailed }
|
|
292
|
+
if self.executeAction(for: .SKIP_TO_PREVIOUS) {
|
|
293
|
+
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] previous track command handled.") }
|
|
208
294
|
} else {
|
|
209
295
|
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] previous track command not handled.") }
|
|
210
296
|
}
|
|
@@ -212,12 +298,9 @@ class THEOplayerRCTRemoteCommandsManager: NSObject {
|
|
|
212
298
|
}
|
|
213
299
|
|
|
214
300
|
@objc private func onNextTrackCommand(_ event: MPRemoteCommandEvent) -> MPRemoteCommandHandlerStatus {
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
!self.inAd {
|
|
219
|
-
player.currentTime = player.currentTime + Double(self.mediaControlConfig.skipForwardInterval)
|
|
220
|
-
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] next track command handled as skip forward command.") }
|
|
301
|
+
guard self.mediaSessionEnabled else { return .commandFailed }
|
|
302
|
+
if self.executeAction(for: .SKIP_TO_NEXT) {
|
|
303
|
+
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] next track command handled.") }
|
|
221
304
|
} else {
|
|
222
305
|
if DEBUG_REMOTECOMMANDS { PrintUtils.printLog(logText: "[NATIVE] next track command not handled.") }
|
|
223
306
|
}
|
|
@@ -1,35 +1,49 @@
|
|
|
1
|
-
// THEOplayerRCTView+
|
|
1
|
+
// THEOplayerRCTView+MediaControlConfig.swift
|
|
2
2
|
|
|
3
3
|
import Foundation
|
|
4
4
|
import THEOplayerSDK
|
|
5
5
|
|
|
6
|
+
let DEFAULT_SKIP_INTERVAL = 15
|
|
7
|
+
let DEFAULT_CONVERT_SKIP_TO_SEEK = false
|
|
8
|
+
let DEFAULT_ALLOW_LIVE_PLAY_PAUSE = true
|
|
9
|
+
let DEFAULT_SEEK_TO_LIVE_ON_RESUME = false
|
|
10
|
+
let DEFAULT_MEDIA_SESSION_ENABLED = true
|
|
11
|
+
|
|
6
12
|
struct MediaControlConfig {
|
|
7
|
-
var
|
|
8
|
-
var
|
|
9
|
-
var
|
|
10
|
-
var
|
|
11
|
-
var
|
|
13
|
+
var mediaSessionEnabled: Bool = DEFAULT_MEDIA_SESSION_ENABLED
|
|
14
|
+
var skipForwardInterval: Int = DEFAULT_SKIP_INTERVAL
|
|
15
|
+
var skipBackwardInterval: Int = DEFAULT_SKIP_INTERVAL
|
|
16
|
+
var convertSkipToSeek: Bool = DEFAULT_CONVERT_SKIP_TO_SEEK
|
|
17
|
+
var allowLivePlayPause: Bool = DEFAULT_ALLOW_LIVE_PLAY_PAUSE
|
|
18
|
+
var seekToLiveOnResume: Bool = DEFAULT_SEEK_TO_LIVE_ON_RESUME
|
|
12
19
|
}
|
|
13
20
|
|
|
14
21
|
extension THEOplayerRCTView {
|
|
15
22
|
|
|
16
23
|
func parseMediaControlConfig(configDict: NSDictionary) {
|
|
17
24
|
if let mediaControlConfig = configDict["mediaControl"] as? NSDictionary {
|
|
25
|
+
// Build the config locally and assign it once, so the didSet observer (and its
|
|
26
|
+
// remoteCommands/nowPlaying refresh) only fires a single time per parse.
|
|
27
|
+
var newConfig = self.mediaControlConfig
|
|
28
|
+
if let mediaSessionEnabled = mediaControlConfig["mediaSessionEnabled"] as? Bool {
|
|
29
|
+
newConfig.mediaSessionEnabled = mediaSessionEnabled
|
|
30
|
+
}
|
|
18
31
|
if let skipForwardInterval = mediaControlConfig["skipForwardInterval"] as? Int {
|
|
19
|
-
|
|
32
|
+
newConfig.skipForwardInterval = skipForwardInterval
|
|
20
33
|
}
|
|
21
34
|
if let skipBackwardInterval = mediaControlConfig["skipBackwardInterval"] as? Int {
|
|
22
|
-
|
|
35
|
+
newConfig.skipBackwardInterval = skipBackwardInterval
|
|
23
36
|
}
|
|
24
37
|
if let convertSkipToSeek = mediaControlConfig["convertSkipToSeek"] as? Bool {
|
|
25
|
-
|
|
38
|
+
newConfig.convertSkipToSeek = convertSkipToSeek
|
|
26
39
|
}
|
|
27
40
|
if let allowLivePlayPause = mediaControlConfig["allowLivePlayPause"] as? Bool {
|
|
28
|
-
|
|
41
|
+
newConfig.allowLivePlayPause = allowLivePlayPause
|
|
29
42
|
}
|
|
30
43
|
if let seekToLiveOnResume = mediaControlConfig["seekToLiveOnResume"] as? Bool {
|
|
31
|
-
|
|
44
|
+
newConfig.seekToLiveOnResume = seekToLiveOnResume
|
|
32
45
|
}
|
|
46
|
+
self.mediaControlConfig = newConfig
|
|
33
47
|
}
|
|
34
48
|
}
|
|
35
49
|
}
|
|
@@ -12,57 +12,55 @@ extension THEOplayerRCTCastAPI {
|
|
|
12
12
|
|
|
13
13
|
@objc(airplayCasting:resolver:rejecter:)
|
|
14
14
|
func airplayCasting(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
|
|
15
|
-
|
|
16
|
-
if let
|
|
17
|
-
let cast = theView.cast(),
|
|
18
|
-
let airplay = cast.airPlay {
|
|
15
|
+
withViewAndCast(node) { _, cast in
|
|
16
|
+
if let airplay = cast.airPlay {
|
|
19
17
|
resolve(airplay.casting)
|
|
20
18
|
} else {
|
|
21
19
|
reject(ERROR_CODE_AIRPLAY_ACCESS_FAILURE, ERROR_MESSAGE_AIRPLAY_ACCESS_FAILURE, nil)
|
|
22
|
-
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current airplay casting status.") }
|
|
20
|
+
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current airplay casting status (airplay unavailable).") }
|
|
23
21
|
}
|
|
22
|
+
} onFailure: {
|
|
23
|
+
reject(ERROR_CODE_CAST_ACCESS_FAILURE, ERROR_MESSAGE_CAST_ACCESS_FAILURE, nil)
|
|
24
|
+
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current airplay casting status (cast module unavailable).") }
|
|
24
25
|
}
|
|
25
26
|
}
|
|
26
27
|
|
|
27
28
|
@objc(airplayState:resolver:rejecter:)
|
|
28
29
|
func airplayState(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
|
|
29
|
-
|
|
30
|
-
if let
|
|
31
|
-
let cast = theView.cast(),
|
|
32
|
-
let airplay = cast.airPlay {
|
|
30
|
+
withViewAndCast(node) { _, cast in
|
|
31
|
+
if let airplay = cast.airPlay {
|
|
33
32
|
resolve(airplay.state._rawValue)
|
|
34
33
|
} else {
|
|
35
34
|
reject(ERROR_CODE_AIRPLAY_ACCESS_FAILURE, ERROR_MESSAGE_AIRPLAY_ACCESS_FAILURE, nil)
|
|
36
|
-
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current airplay state.") }
|
|
35
|
+
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current airplay state (airplay unavailable).") }
|
|
37
36
|
}
|
|
37
|
+
} onFailure: {
|
|
38
|
+
reject(ERROR_CODE_CAST_ACCESS_FAILURE, ERROR_MESSAGE_CAST_ACCESS_FAILURE, nil)
|
|
39
|
+
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current airplay state (cast module unavailable).") }
|
|
38
40
|
}
|
|
39
41
|
}
|
|
40
42
|
|
|
41
43
|
@objc(airplayStart:)
|
|
42
44
|
func airplayStart(_ node: NSNumber) -> Void {
|
|
43
|
-
|
|
44
|
-
if let
|
|
45
|
-
let cast = theView.cast(),
|
|
46
|
-
let airplay = cast.airPlay {
|
|
45
|
+
withViewAndCast(node) { _, cast in
|
|
46
|
+
if let airplay = cast.airPlay {
|
|
47
47
|
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Starting airplay session.") }
|
|
48
48
|
airplay.start()
|
|
49
|
-
} else {
|
|
50
|
-
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not start airplay session.") }
|
|
51
49
|
}
|
|
50
|
+
} onFailure: {
|
|
51
|
+
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not start airplay session.") }
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
@objc(airplayStop:)
|
|
56
56
|
func airplayStop(_ node: NSNumber) -> Void {
|
|
57
|
-
|
|
58
|
-
if let
|
|
59
|
-
let cast = theView.cast(),
|
|
60
|
-
let airplay = cast.airPlay {
|
|
57
|
+
withViewAndCast(node) { _, cast in
|
|
58
|
+
if let airplay = cast.airPlay {
|
|
61
59
|
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Stopping airplay session.") }
|
|
62
60
|
airplay.stop()
|
|
63
|
-
} else {
|
|
64
|
-
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not stop airplay session.") }
|
|
65
61
|
}
|
|
62
|
+
} onFailure: {
|
|
63
|
+
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not stop airplay session.") }
|
|
66
64
|
}
|
|
67
65
|
}
|
|
68
66
|
|
|
@@ -12,85 +12,79 @@ extension THEOplayerRCTCastAPI {
|
|
|
12
12
|
|
|
13
13
|
@objc(chromecastCasting:resolver:rejecter:)
|
|
14
14
|
func chromecastCasting(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
|
|
15
|
-
|
|
16
|
-
if let
|
|
17
|
-
let cast = theView.cast(),
|
|
18
|
-
let chromecast = cast.chromecast {
|
|
15
|
+
withViewAndCast(node) { _, cast in
|
|
16
|
+
if let chromecast = cast.chromecast {
|
|
19
17
|
resolve(chromecast.casting)
|
|
20
18
|
} else {
|
|
21
19
|
reject(ERROR_CODE_CHROMECAST_ACCESS_FAILURE, ERROR_MESSAGE_CHROMECAST_ACCESS_FAILURE, nil)
|
|
22
|
-
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current chromecast casting status.") }
|
|
20
|
+
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current chromecast casting status (chromecast unavailable).") }
|
|
23
21
|
}
|
|
22
|
+
} onFailure: {
|
|
23
|
+
reject(ERROR_CODE_CAST_ACCESS_FAILURE, ERROR_MESSAGE_CAST_ACCESS_FAILURE, nil)
|
|
24
|
+
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current chromecast casting status (cast module unavailable).") }
|
|
24
25
|
}
|
|
25
26
|
}
|
|
26
27
|
|
|
27
28
|
@objc(chromecastState:resolver:rejecter:)
|
|
28
29
|
func chromecastState(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
|
|
29
|
-
|
|
30
|
-
if let
|
|
31
|
-
let cast = theView.cast(),
|
|
32
|
-
let chromecast = cast.chromecast {
|
|
30
|
+
withViewAndCast(node) { _, cast in
|
|
31
|
+
if let chromecast = cast.chromecast {
|
|
33
32
|
resolve(chromecast.state?._rawValue)
|
|
34
33
|
} else {
|
|
35
34
|
reject(ERROR_CODE_CHROMECAST_ACCESS_FAILURE, ERROR_MESSAGE_CHROMECAST_ACCESS_FAILURE, nil)
|
|
36
|
-
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current chromecast state.") }
|
|
35
|
+
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current chromecast state (chromecast unavailable).") }
|
|
37
36
|
}
|
|
37
|
+
} onFailure: {
|
|
38
|
+
reject(ERROR_CODE_CAST_ACCESS_FAILURE, ERROR_MESSAGE_CAST_ACCESS_FAILURE, nil)
|
|
39
|
+
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current chromecast state (cast module unavailable).") }
|
|
38
40
|
}
|
|
39
41
|
}
|
|
40
42
|
|
|
41
43
|
@objc(chromecastStart:)
|
|
42
44
|
func chromecastStart(_ node: NSNumber) -> Void {
|
|
43
|
-
|
|
44
|
-
if let
|
|
45
|
-
let cast = theView.cast(),
|
|
46
|
-
let chromecast = cast.chromecast {
|
|
45
|
+
withViewAndCast(node) { _, cast in
|
|
46
|
+
if let chromecast = cast.chromecast {
|
|
47
47
|
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Starting chromecast session.") }
|
|
48
48
|
chromecast.start()
|
|
49
|
-
} else {
|
|
50
|
-
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not start chromecast session.") }
|
|
51
49
|
}
|
|
50
|
+
} onFailure: {
|
|
51
|
+
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not start chromecast session.") }
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
@objc(chromecastStop:)
|
|
56
56
|
func chromecastStop(_ node: NSNumber) -> Void {
|
|
57
|
-
|
|
58
|
-
if let
|
|
59
|
-
let cast = theView.cast(),
|
|
60
|
-
let chromecast = cast.chromecast {
|
|
57
|
+
withViewAndCast(node) { _, cast in
|
|
58
|
+
if let chromecast = cast.chromecast {
|
|
61
59
|
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Stopping chromecast session.") }
|
|
62
60
|
chromecast.stop()
|
|
63
|
-
} else {
|
|
64
|
-
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not stop chromecast session.") }
|
|
65
61
|
}
|
|
62
|
+
} onFailure: {
|
|
63
|
+
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not stop chromecast session.") }
|
|
66
64
|
}
|
|
67
65
|
}
|
|
68
66
|
|
|
69
67
|
@objc(chromecastJoin:)
|
|
70
68
|
func chromecastJoin(_ node: NSNumber) -> Void {
|
|
71
|
-
|
|
72
|
-
if let
|
|
73
|
-
let cast = theView.cast(),
|
|
74
|
-
let chromecast = cast.chromecast {
|
|
69
|
+
withViewAndCast(node) { _, cast in
|
|
70
|
+
if let chromecast = cast.chromecast {
|
|
75
71
|
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Joining chromecast session.") }
|
|
76
72
|
chromecast.join()
|
|
77
|
-
} else {
|
|
78
|
-
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not join chromecast session.") }
|
|
79
73
|
}
|
|
74
|
+
} onFailure: {
|
|
75
|
+
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not join chromecast session.") }
|
|
80
76
|
}
|
|
81
77
|
}
|
|
82
78
|
|
|
83
79
|
@objc(chromecastLeave:)
|
|
84
80
|
func chromecastLeave(_ node: NSNumber) -> Void {
|
|
85
|
-
|
|
86
|
-
if let
|
|
87
|
-
let cast = theView.cast(),
|
|
88
|
-
let chromecast = cast.chromecast {
|
|
81
|
+
withViewAndCast(node) { _, cast in
|
|
82
|
+
if let chromecast = cast.chromecast {
|
|
89
83
|
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Leaving chromecast session.") }
|
|
90
84
|
chromecast.leave()
|
|
91
|
-
} else {
|
|
92
|
-
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not leave chromecast session.") }
|
|
93
85
|
}
|
|
86
|
+
} onFailure: {
|
|
87
|
+
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not leave chromecast session.") }
|
|
94
88
|
}
|
|
95
89
|
}
|
|
96
90
|
|
|
@@ -26,14 +26,11 @@ class THEOplayerRCTCastAPI: NSObject, RCTBridgeModule {
|
|
|
26
26
|
|
|
27
27
|
@objc(casting:resolver:rejecter:)
|
|
28
28
|
func casting(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
reject(ERROR_CODE_CAST_ACCESS_FAILURE, ERROR_MESSAGE_CAST_ACCESS_FAILURE, nil)
|
|
35
|
-
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current casting status (cast module unavailable).") }
|
|
36
|
-
}
|
|
29
|
+
withViewAndCast(node) { _, cast in
|
|
30
|
+
resolve(cast.casting)
|
|
31
|
+
} onFailure: {
|
|
32
|
+
reject(ERROR_CODE_CAST_ACCESS_FAILURE, ERROR_MESSAGE_CAST_ACCESS_FAILURE, nil)
|
|
33
|
+
if DEBUG_CAST_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current casting status (cast module unavailable).") }
|
|
37
34
|
}
|
|
38
35
|
}
|
|
39
36
|
|
|
@@ -24,10 +24,8 @@ class THEOplayerRCTBroadcastAPI: NSObject, RCTBridgeModule {
|
|
|
24
24
|
|
|
25
25
|
@objc(broadcastEvent:event:)
|
|
26
26
|
func broadcastEvent(_ node: NSNumber, event: NSDictionary) -> Void {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
theView.broadcastEventHandler.broadcastEvent(eventData: event)
|
|
30
|
-
}
|
|
27
|
+
withView(node) { theView in
|
|
28
|
+
theView.broadcastEventHandler.broadcastEvent(eventData: event)
|
|
31
29
|
}
|
|
32
30
|
}
|
|
33
31
|
}
|