react-native-theoplayer 11.5.0 → 11.7.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 +32 -1
- package/README.md +70 -0
- package/android/build.gradle +1 -0
- package/android/src/main/java/com/theoplayer/PlayerConfigAdapter.kt +6 -0
- package/android/src/main/java/com/theoplayer/PlayerEventEmitter.kt +11 -2
- package/android/src/main/java/com/theoplayer/ReactTHEOplayerContext.kt +95 -93
- package/android/src/main/java/com/theoplayer/ReactTHEOplayerPackage.kt +6 -0
- package/android/src/main/java/com/theoplayer/ReactTHEOplayerView.kt +51 -3
- package/android/src/main/java/com/theoplayer/ads/AdEventAdapter.kt +4 -0
- package/android/src/main/java/com/theoplayer/ads/AdsModule.kt +6 -6
- package/android/src/main/java/com/theoplayer/integration/Integration.kt +72 -0
- package/android/src/main/java/com/theoplayer/integration/IntegrationRegistration.kt +68 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacade.kt +187 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeAdState.kt +19 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeAds.kt +73 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeAdsBridge.kt +112 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeEventSubscription.kt +11 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeEvents.kt +139 -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/metrics/MetricsModule.kt +37 -0
- 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/theoads/THEOadsModule.kt +1 -1
- 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/android/src/test/java/com/theoplayer/integration/PlayerFacadeAdsBridgeTest.kt +250 -0
- package/android/src/test/java/com/theoplayer/integration/PlayerFacadeConfigurationTest.kt +30 -0
- package/android/src/test/java/com/theoplayer/integration/PlayerFacadeTest.kt +507 -0
- package/android/src/test/java/com/theoplayer/integration/PlayerFacadeTestHost.kt +104 -0
- package/ios/THEOplayerRCTBridge.m +35 -0
- package/ios/THEOplayerRCTDebug.swift +3 -0
- package/ios/THEOplayerRCTMainEventHandler.swift +17 -0
- package/ios/THEOplayerRCTPlayerAPI.swift +31 -0
- package/ios/THEOplayerRCTTypeUtils.swift +30 -0
- package/ios/THEOplayerRCTView.swift +15 -5
- package/ios/Theoplayer-Bridging-Header.h +0 -1
- package/ios/backgroundAudio/THEOplayerRCTBackgroundAudioManager.swift +1 -1
- package/ios/backgroundAudio/THEOplayerRCTNowPlayingManager.swift +49 -3
- package/ios/backgroundAudio/THEOplayerRCTRemoteCommandsManager.swift +151 -68
- package/ios/backgroundAudio/THEOplayerRCTView+MediaControlConfig.swift +25 -11
- package/ios/mediaControl/THEOplayerRCTMediaControlAPI.swift +79 -0
- package/ios/mediaControl/THEOplayerRCTMediaControlManager.swift +38 -0
- package/ios/metrics/THEOplayerRCTMetricsAPI.swift +31 -0
- package/ios/pip/THEOplayerRCTPipControlsManager.swift +9 -12
- package/lib/commonjs/api/barrel.js +31 -20
- package/lib/commonjs/api/barrel.js.map +1 -1
- package/lib/commonjs/api/event/PlayerEvent.js +8 -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/metrics/MetricsAPI.js +2 -0
- package/lib/commonjs/api/metrics/MetricsAPI.js.map +1 -0
- package/lib/commonjs/api/metrics/barrel.js +17 -0
- package/lib/commonjs/api/metrics/barrel.js.map +1 -0
- package/lib/commonjs/api/player/Integration.js +2 -0
- package/lib/commonjs/api/player/Integration.js.map +1 -0
- package/lib/commonjs/api/player/PlayerEventMap.js +1 -0
- package/lib/commonjs/api/player/PlayerEventMap.js.map +1 -1
- package/lib/commonjs/api/player/THEOplayer.js.map +1 -1
- package/lib/commonjs/api/player/barrel.js +11 -0
- package/lib/commonjs/api/player/barrel.js.map +1 -1
- package/lib/commonjs/api/track/MediaTrack.js +16 -0
- package/lib/commonjs/api/track/MediaTrack.js.map +1 -1
- package/lib/commonjs/internal/THEOplayerView.js +6 -0
- package/lib/commonjs/internal/THEOplayerView.js.map +1 -1
- package/lib/commonjs/internal/THEOplayerView.web.js +3 -1
- package/lib/commonjs/internal/THEOplayerView.web.js.map +1 -1
- package/lib/commonjs/internal/adapter/DefaultNativePlayerState.js +1 -0
- package/lib/commonjs/internal/adapter/DefaultNativePlayerState.js.map +1 -1
- package/lib/commonjs/internal/adapter/THEOplayerAdapter.js +24 -0
- package/lib/commonjs/internal/adapter/THEOplayerAdapter.js.map +1 -1
- package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js +29 -12
- package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
- package/lib/commonjs/internal/adapter/WebEventForwarder.js +6 -1
- package/lib/commonjs/internal/adapter/WebEventForwarder.js.map +1 -1
- package/lib/commonjs/internal/adapter/event/PlayerEvents.js +7 -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/metrics/MetricsNativeAdapter.js +18 -0
- package/lib/commonjs/internal/adapter/metrics/MetricsNativeAdapter.js.map +1 -0
- package/lib/commonjs/internal/adapter/metrics/MetricsWebAdapter.js +16 -0
- package/lib/commonjs/internal/adapter/metrics/MetricsWebAdapter.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/IntegrationRegistration.js +6 -0
- package/lib/commonjs/internal/adapter/web/IntegrationRegistration.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacade.js +258 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacade.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeAPI.js +6 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeAPI.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeAdsEvents.js +114 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeAdsEvents.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeIntegration.js +6 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeIntegration.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeTypes.js +6 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeTypes.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/barrel.js +1 -0
- package/lib/module/api/barrel.js.map +1 -1
- package/lib/module/api/event/PlayerEvent.js +9 -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/metrics/MetricsAPI.js +2 -0
- package/lib/module/api/metrics/MetricsAPI.js.map +1 -0
- package/lib/module/api/metrics/barrel.js +4 -0
- package/lib/module/api/metrics/barrel.js.map +1 -0
- package/lib/module/api/player/Integration.js +2 -0
- package/lib/module/api/player/Integration.js.map +1 -0
- package/lib/module/api/player/PlayerEventMap.js +1 -0
- package/lib/module/api/player/PlayerEventMap.js.map +1 -1
- package/lib/module/api/player/THEOplayer.js.map +1 -1
- package/lib/module/api/player/barrel.js +1 -0
- package/lib/module/api/player/barrel.js.map +1 -1
- package/lib/module/api/track/MediaTrack.js +16 -0
- package/lib/module/api/track/MediaTrack.js.map +1 -1
- package/lib/module/internal/THEOplayerView.js +7 -1
- package/lib/module/internal/THEOplayerView.js.map +1 -1
- package/lib/module/internal/THEOplayerView.web.js +3 -1
- package/lib/module/internal/THEOplayerView.web.js.map +1 -1
- package/lib/module/internal/adapter/DefaultNativePlayerState.js +1 -0
- package/lib/module/internal/adapter/DefaultNativePlayerState.js.map +1 -1
- package/lib/module/internal/adapter/THEOplayerAdapter.js +24 -0
- package/lib/module/internal/adapter/THEOplayerAdapter.js.map +1 -1
- package/lib/module/internal/adapter/THEOplayerWebAdapter.js +29 -12
- package/lib/module/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
- package/lib/module/internal/adapter/WebEventForwarder.js +7 -2
- package/lib/module/internal/adapter/WebEventForwarder.js.map +1 -1
- package/lib/module/internal/adapter/event/PlayerEvents.js +5 -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/metrics/MetricsNativeAdapter.js +13 -0
- package/lib/module/internal/adapter/metrics/MetricsNativeAdapter.js.map +1 -0
- package/lib/module/internal/adapter/metrics/MetricsWebAdapter.js +11 -0
- package/lib/module/internal/adapter/metrics/MetricsWebAdapter.js.map +1 -0
- package/lib/module/internal/adapter/web/IntegrationRegistration.js +4 -0
- package/lib/module/internal/adapter/web/IntegrationRegistration.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacade.js +253 -0
- package/lib/module/internal/adapter/web/PlayerFacade.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacadeAPI.js +4 -0
- package/lib/module/internal/adapter/web/PlayerFacadeAPI.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacadeAdsEvents.js +109 -0
- package/lib/module/internal/adapter/web/PlayerFacadeAdsEvents.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacadeIntegration.js +4 -0
- package/lib/module/internal/adapter/web/PlayerFacadeIntegration.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacadeTypes.js +4 -0
- package/lib/module/internal/adapter/web/PlayerFacadeTypes.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/__tests__/PlayerFacade.test.d.ts +2 -0
- package/lib/typescript/__tests__/PlayerFacade.test.d.ts.map +1 -0
- package/lib/typescript/__tests__/PlayerFacadeWebAdapter.test.d.ts +2 -0
- package/lib/typescript/__tests__/PlayerFacadeWebAdapter.test.d.ts.map +1 -0
- package/lib/typescript/__tests__/index.test.d.ts +13 -0
- package/lib/typescript/__tests__/index.test.d.ts.map +1 -1
- package/lib/typescript/api/THEOplayerView.d.ts +4 -0
- package/lib/typescript/api/THEOplayerView.d.ts.map +1 -1
- package/lib/typescript/api/barrel.d.ts +1 -0
- package/lib/typescript/api/barrel.d.ts.map +1 -1
- package/lib/typescript/api/config/PlayerConfiguration.d.ts +15 -0
- package/lib/typescript/api/config/PlayerConfiguration.d.ts.map +1 -1
- package/lib/typescript/api/event/AdEvent.d.ts +1 -1
- package/lib/typescript/api/event/PlayerEvent.d.ts +9 -0
- 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/metrics/MetricsAPI.d.ts +21 -0
- package/lib/typescript/api/metrics/MetricsAPI.d.ts.map +1 -0
- package/lib/typescript/api/metrics/barrel.d.ts +2 -0
- package/lib/typescript/api/metrics/barrel.d.ts.map +1 -0
- package/lib/typescript/api/player/Integration.d.ts +88 -0
- package/lib/typescript/api/player/Integration.d.ts.map +1 -0
- package/lib/typescript/api/player/PlayerEventMap.d.ts +7 -2
- package/lib/typescript/api/player/PlayerEventMap.d.ts.map +1 -1
- package/lib/typescript/api/player/THEOplayer.d.ts +24 -0
- package/lib/typescript/api/player/THEOplayer.d.ts.map +1 -1
- package/lib/typescript/api/player/barrel.d.ts +1 -0
- package/lib/typescript/api/player/barrel.d.ts.map +1 -1
- package/lib/typescript/api/track/MediaTrack.d.ts +21 -4
- package/lib/typescript/api/track/MediaTrack.d.ts.map +1 -1
- package/lib/typescript/internal/THEOplayerView.d.ts +1 -0
- package/lib/typescript/internal/THEOplayerView.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/DefaultNativePlayerState.d.ts +1 -0
- package/lib/typescript/internal/adapter/DefaultNativePlayerState.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/NativePlayerState.d.ts +1 -0
- package/lib/typescript/internal/adapter/NativePlayerState.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts +8 -1
- package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts +8 -2
- package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/WebEventForwarder.d.ts +1 -0
- package/lib/typescript/internal/adapter/WebEventForwarder.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/event/PlayerEvents.d.ts +4 -1
- package/lib/typescript/internal/adapter/event/PlayerEvents.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/event/native/NativePlayerEvent.d.ts +1 -0
- 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/metrics/MetricsNativeAdapter.d.ts +7 -0
- package/lib/typescript/internal/adapter/metrics/MetricsNativeAdapter.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/metrics/MetricsWebAdapter.d.ts +8 -0
- package/lib/typescript/internal/adapter/metrics/MetricsWebAdapter.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/IntegrationRegistration.d.ts +53 -0
- package/lib/typescript/internal/adapter/web/IntegrationRegistration.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacade.d.ts +26 -0
- package/lib/typescript/internal/adapter/web/PlayerFacade.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeAPI.d.ts +33 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeAPI.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeAdsEvents.d.ts +21 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeAdsEvents.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeIntegration.d.ts +43 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeIntegration.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeTypes.d.ts +13 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeTypes.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 +7 -7
- package/src/__tests__/PlayerFacade.test.ts +579 -0
- package/src/__tests__/PlayerFacadeWebAdapter.test.ts +193 -0
- package/src/__tests__/index.test.tsx +15 -1
- package/src/api/THEOplayerView.ts +5 -0
- package/src/api/barrel.ts +1 -0
- package/src/api/config/PlayerConfiguration.ts +16 -0
- package/src/api/event/AdEvent.ts +1 -1
- package/src/api/event/PlayerEvent.ts +10 -0
- 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/metrics/MetricsAPI.ts +20 -0
- package/src/api/metrics/barrel.ts +1 -0
- package/src/api/player/Integration.ts +97 -0
- package/src/api/player/PlayerEventMap.ts +7 -0
- package/src/api/player/THEOplayer.ts +27 -0
- package/src/api/player/barrel.ts +1 -0
- package/src/api/track/MediaTrack.ts +21 -4
- package/src/internal/THEOplayerView.tsx +10 -2
- package/src/internal/THEOplayerView.web.tsx +2 -2
- package/src/internal/adapter/DefaultNativePlayerState.ts +1 -0
- package/src/internal/adapter/NativePlayerState.ts +1 -0
- package/src/internal/adapter/THEOplayerAdapter.ts +33 -0
- package/src/internal/adapter/THEOplayerWebAdapter.ts +38 -12
- package/src/internal/adapter/WebEventForwarder.ts +12 -3
- package/src/internal/adapter/event/PlayerEvents.ts +10 -0
- package/src/internal/adapter/event/native/NativePlayerEvent.ts +2 -0
- package/src/internal/adapter/media/MediaControlNativeAdapter.ts +38 -0
- package/src/internal/adapter/media/MediaControlWebAdapter.ts +28 -0
- package/src/internal/adapter/metrics/MetricsNativeAdapter.ts +12 -0
- package/src/internal/adapter/metrics/MetricsWebAdapter.ts +14 -0
- package/src/internal/adapter/web/IntegrationRegistration.ts +57 -0
- package/src/internal/adapter/web/PlayerFacade.ts +281 -0
- package/src/internal/adapter/web/PlayerFacadeAPI.ts +35 -0
- package/src/internal/adapter/web/PlayerFacadeAdsEvents.ts +119 -0
- package/src/internal/adapter/web/PlayerFacadeIntegration.ts +45 -0
- package/src/internal/adapter/web/PlayerFacadeTypes.ts +14 -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
|
@@ -31,6 +31,7 @@ public class THEOplayerRCTMainEventHandler {
|
|
|
31
31
|
var onNativeWaiting: RCTDirectEventBlock?
|
|
32
32
|
var onNativeCanPlay: RCTDirectEventBlock?
|
|
33
33
|
var onNativeContentProtectionError: RCTDirectEventBlock?
|
|
34
|
+
var onNativeContentProtectionSuccess: RCTDirectEventBlock?
|
|
34
35
|
var onNativeDimensionChange: RCTDirectEventBlock?
|
|
35
36
|
var onNativeVideoResize: RCTDirectEventBlock?
|
|
36
37
|
|
|
@@ -55,6 +56,7 @@ public class THEOplayerRCTMainEventHandler {
|
|
|
55
56
|
private var rateChangeListener: EventListener?
|
|
56
57
|
private var waitingListener: EventListener?
|
|
57
58
|
private var canPlayListener: EventListener?
|
|
59
|
+
private var contentProtectionSuccessListener: EventListener?
|
|
58
60
|
private var videoResizeListener: EventListener?
|
|
59
61
|
|
|
60
62
|
// MARK: player observer
|
|
@@ -279,6 +281,15 @@ public class THEOplayerRCTMainEventHandler {
|
|
|
279
281
|
}
|
|
280
282
|
if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] Error listener attached to THEOplayer") }
|
|
281
283
|
|
|
284
|
+
// CONTENT_PROTECTION_SUCCESS
|
|
285
|
+
self.contentProtectionSuccessListener = player.addEventListener(type: PlayerEventTypes.CONTENT_PROTECTION_SUCCESS) { [weak self] event in
|
|
286
|
+
if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received CONTENT_PROTECTION_SUCCESS event from THEOplayer") }
|
|
287
|
+
if let forwardedContentProtectionSuccessEvent = self?.onNativeContentProtectionSuccess {
|
|
288
|
+
forwardedContentProtectionSuccessEvent([:])
|
|
289
|
+
}
|
|
290
|
+
}
|
|
291
|
+
if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] ContentProtectionSuccess listener attached to THEOplayer") }
|
|
292
|
+
|
|
282
293
|
// LOADED_DATA
|
|
283
294
|
self.loadedDataListener = player.addEventListener(type: PlayerEventTypes.LOADED_DATA) { [weak self] event in
|
|
284
295
|
if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received LOADED_DATA event from THEOplayer") }
|
|
@@ -452,6 +463,12 @@ public class THEOplayerRCTMainEventHandler {
|
|
|
452
463
|
if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] Error listener dettached from THEOplayer") }
|
|
453
464
|
}
|
|
454
465
|
|
|
466
|
+
// CONTENT_PROTECTION_SUCCESS
|
|
467
|
+
if let contentProtectionSuccessListener = self.contentProtectionSuccessListener {
|
|
468
|
+
player.removeEventListener(type: PlayerEventTypes.CONTENT_PROTECTION_SUCCESS, listener: contentProtectionSuccessListener)
|
|
469
|
+
if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] ContentProtectionSuccess listener dettached from THEOplayer") }
|
|
470
|
+
}
|
|
471
|
+
|
|
455
472
|
// LOADED_DATA
|
|
456
473
|
if let loadedDataListener = self.loadedDataListener {
|
|
457
474
|
player.removeEventListener(type: PlayerEventTypes.LOADED_DATA, listener: loadedDataListener)
|
|
@@ -22,6 +22,9 @@ let TTS_PROP_COLOR_G = "g"
|
|
|
22
22
|
let TTS_PROP_COLOR_B = "b"
|
|
23
23
|
let TTS_PROP_COLOR_A = "a"
|
|
24
24
|
|
|
25
|
+
let ERROR_CODE_PLAYER_ACCESS_FAILURE = "player_access_failure"
|
|
26
|
+
let ERROR_MESSAGE_PLAYER_ACCESS_FAILURE = "Could not access THEOplayer"
|
|
27
|
+
|
|
25
28
|
@objc(THEOplayerRCTPlayerAPI)
|
|
26
29
|
class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
|
|
27
30
|
@objc var bridge: RCTBridge!
|
|
@@ -203,6 +206,34 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
|
|
|
203
206
|
}
|
|
204
207
|
}
|
|
205
208
|
|
|
209
|
+
@objc(setManageContentMatching:enable:)
|
|
210
|
+
func setManageContentMatching(_ node: NSNumber, enable: Bool) -> Void {
|
|
211
|
+
#if os(tvOS)
|
|
212
|
+
withViewAndPlayer(node) { _, player in
|
|
213
|
+
if player.manageContentMatching != enable {
|
|
214
|
+
if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Changing TheoPlayer's manageContentMatching to \(enable)") }
|
|
215
|
+
player.manageContentMatching = enable
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
#endif
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
// Not used by the THEOplayerAdapter, which reads the value from its cached player state.
|
|
222
|
+
// This getter exists for the e2e test app, allowing it to verify that the value was
|
|
223
|
+
// effectively applied on the native player.
|
|
224
|
+
@objc(getManageContentMatching:resolver:rejecter:)
|
|
225
|
+
func getManageContentMatching(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
|
|
226
|
+
#if os(tvOS)
|
|
227
|
+
withViewAndPlayer(node) { _, player in
|
|
228
|
+
resolve(player.manageContentMatching)
|
|
229
|
+
} onFailure: {
|
|
230
|
+
reject(ERROR_CODE_PLAYER_ACCESS_FAILURE, ERROR_MESSAGE_PLAYER_ACCESS_FAILURE, nil)
|
|
231
|
+
}
|
|
232
|
+
#else
|
|
233
|
+
resolve(false)
|
|
234
|
+
#endif
|
|
235
|
+
}
|
|
236
|
+
|
|
206
237
|
@objc(setPipConfig:pipConfig:)
|
|
207
238
|
func setPipConfig(_ node: NSNumber, pipConfig: NSDictionary) -> Void {
|
|
208
239
|
withView(node) { theView in
|
|
@@ -114,6 +114,36 @@ class THEOplayerRCTTypeUtils {
|
|
|
114
114
|
}
|
|
115
115
|
}
|
|
116
116
|
|
|
117
|
+
class func mediaControlActionFromString(_ action: String) -> MediaControlAction {
|
|
118
|
+
switch action {
|
|
119
|
+
case "play":
|
|
120
|
+
return MediaControlAction.PLAY
|
|
121
|
+
case "pause":
|
|
122
|
+
return MediaControlAction.PAUSE
|
|
123
|
+
case "skipToPrevious":
|
|
124
|
+
return MediaControlAction.SKIP_TO_PREVIOUS
|
|
125
|
+
case "skipToNext":
|
|
126
|
+
return MediaControlAction.SKIP_TO_NEXT
|
|
127
|
+
default:
|
|
128
|
+
return MediaControlAction.PLAY
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
class func mediaControlActionToString(_ action: MediaControlAction) -> String {
|
|
133
|
+
switch action {
|
|
134
|
+
case MediaControlAction.PLAY:
|
|
135
|
+
return "play"
|
|
136
|
+
case MediaControlAction.PAUSE:
|
|
137
|
+
return "pause"
|
|
138
|
+
case MediaControlAction.SKIP_TO_PREVIOUS:
|
|
139
|
+
return "skipToPrevious"
|
|
140
|
+
case MediaControlAction.SKIP_TO_NEXT:
|
|
141
|
+
return "skipToNext"
|
|
142
|
+
default:
|
|
143
|
+
return "play"
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
|
|
117
147
|
class func textTrackEdgeStyleStringFromString(_ style: String) -> String {
|
|
118
148
|
switch style {
|
|
119
149
|
case "dropshadow":
|
|
@@ -42,6 +42,7 @@ public class THEOplayerRCTView: UIView {
|
|
|
42
42
|
var remoteCommandsManager: THEOplayerRCTRemoteCommandsManager
|
|
43
43
|
var pipManager: THEOplayerRCTPipManager
|
|
44
44
|
var pipControlsManager: THEOplayerRCTPipControlsManager
|
|
45
|
+
var mediaControlManager: THEOplayerRCTMediaControlManager
|
|
45
46
|
var isApplicationInBackground: Bool = (UIApplication.shared.applicationState == .background)
|
|
46
47
|
|
|
47
48
|
var adsConfig = AdsConfig()
|
|
@@ -71,12 +72,13 @@ public class THEOplayerRCTView: UIView {
|
|
|
71
72
|
|
|
72
73
|
var mediaControlConfig = MediaControlConfig() {
|
|
73
74
|
didSet {
|
|
74
|
-
self.remoteCommandsManager.
|
|
75
|
+
self.remoteCommandsManager.updateRemoteCommands()
|
|
76
|
+
self.nowPlayingManager.updateNowPlayingInfo()
|
|
75
77
|
}
|
|
76
78
|
}
|
|
77
79
|
var pipConfig = PipConfig() {
|
|
78
80
|
didSet {
|
|
79
|
-
self.pipControlsManager.
|
|
81
|
+
self.pipControlsManager.updatePipControls()
|
|
80
82
|
}
|
|
81
83
|
}
|
|
82
84
|
var backgroundAudioConfig = BackgroundAudioConfig() {
|
|
@@ -115,6 +117,7 @@ public class THEOplayerRCTView: UIView {
|
|
|
115
117
|
self.remoteCommandsManager = THEOplayerRCTRemoteCommandsManager()
|
|
116
118
|
self.pipManager = THEOplayerRCTPipManager()
|
|
117
119
|
self.pipControlsManager = THEOplayerRCTPipControlsManager()
|
|
120
|
+
self.mediaControlManager = THEOplayerRCTMediaControlManager()
|
|
118
121
|
super.init(frame: .zero)
|
|
119
122
|
|
|
120
123
|
self.setupAppStateObservers()
|
|
@@ -151,6 +154,7 @@ public class THEOplayerRCTView: UIView {
|
|
|
151
154
|
self.pipControlsManager.destroy()
|
|
152
155
|
self.presentationModeManager.destroy()
|
|
153
156
|
self.backgroundAudioManager.destroy()
|
|
157
|
+
self.mediaControlManager.destroy()
|
|
154
158
|
|
|
155
159
|
self.destroyBackgroundAudio()
|
|
156
160
|
self.player?.removeAllIntegrations()
|
|
@@ -216,9 +220,9 @@ public class THEOplayerRCTView: UIView {
|
|
|
216
220
|
self.theoliveEventHandler.setPlayer(player)
|
|
217
221
|
self.theoadsEventHandler.setPlayer(player)
|
|
218
222
|
self.castEventHandler.setPlayer(player)
|
|
219
|
-
self.nowPlayingManager.setPlayer(player)
|
|
220
|
-
self.remoteCommandsManager.setPlayer(player)
|
|
221
|
-
self.pipControlsManager.setPlayer(player)
|
|
223
|
+
self.nowPlayingManager.setPlayer(player, view: self)
|
|
224
|
+
self.remoteCommandsManager.setPlayer(player, view: self)
|
|
225
|
+
self.pipControlsManager.setPlayer(player, view: self)
|
|
222
226
|
self.presentationModeManager.setPlayer(player, view: self)
|
|
223
227
|
self.backgroundAudioManager.setPlayer(player, view: self)
|
|
224
228
|
self.pipManager.setView(view: self)
|
|
@@ -476,6 +480,12 @@ public class THEOplayerRCTView: UIView {
|
|
|
476
480
|
if DEBUG_VIEW { PrintUtils.printLog(logText: "[NATIVE] nativeContentProtectionError prop set.") }
|
|
477
481
|
}
|
|
478
482
|
|
|
483
|
+
@objc(setOnNativeContentProtectionSuccess:)
|
|
484
|
+
func setOnNativeContentProtectionSuccess(nativeContentProtectionSuccess: @escaping RCTDirectEventBlock) {
|
|
485
|
+
self.mainEventHandler.onNativeContentProtectionSuccess = nativeContentProtectionSuccess
|
|
486
|
+
if DEBUG_VIEW { PrintUtils.printLog(logText: "[NATIVE] nativeContentProtectionSuccess prop set.") }
|
|
487
|
+
}
|
|
488
|
+
|
|
479
489
|
@objc(setOnNativeDimensionChange:)
|
|
480
490
|
func setOnNativeDimensionChange(nativeDimensionChange: @escaping RCTDirectEventBlock) {
|
|
481
491
|
self.mainEventHandler.onNativeDimensionChange = nativeDimensionChange
|
|
@@ -27,7 +27,7 @@ class THEOplayerRCTBackgroundAudioManager: NSObject, BackgroundPlaybackDelegate
|
|
|
27
27
|
let inPip = view.presentationModeManager.presentationMode == .pictureInPicture
|
|
28
28
|
|
|
29
29
|
if stopOnBackground && !inPip {
|
|
30
|
-
if
|
|
30
|
+
if DEBUG_THEOPLAYER_INTERACTION { PrintUtils.printLog(logText: "[NATIVE] Moved to background, not in pip and stopOnBackground is enabled => stopping playback") }
|
|
31
31
|
player.stop()
|
|
32
32
|
return false
|
|
33
33
|
}
|
|
@@ -7,10 +7,21 @@ import MediaPlayer
|
|
|
7
7
|
class THEOplayerRCTNowPlayingManager {
|
|
8
8
|
// MARK: Members
|
|
9
9
|
private weak var player: THEOplayer?
|
|
10
|
+
private weak var view: THEOplayerRCTView?
|
|
10
11
|
private let nowPlayingQueue = DispatchQueue(label: "com.theoplayer.reactnative.nowplayinginfo")
|
|
11
12
|
private var nowPlayingInfoStorage = [String : Any]()
|
|
12
13
|
private var nowPlayingInfoGeneration: Int = 0
|
|
13
14
|
|
|
15
|
+
// The player that most recently published Now Playing info to the process-wide info center.
|
|
16
|
+
// Used to scope clearing so a disabled player only clears its own info and never clobbers
|
|
17
|
+
// another (newly-active) owner during a multi-player hand-off.
|
|
18
|
+
private static weak var currentOwner: THEOplayerRCTNowPlayingManager?
|
|
19
|
+
|
|
20
|
+
// MARK: computed
|
|
21
|
+
private var mediaSessionEnabled: Bool {
|
|
22
|
+
self.view?.mediaControlConfig.mediaSessionEnabled ?? DEFAULT_MEDIA_SESSION_ENABLED
|
|
23
|
+
}
|
|
24
|
+
|
|
14
25
|
// MARK: player Listeners
|
|
15
26
|
private var durationChangeListener: EventListener?
|
|
16
27
|
private var playingListener: EventListener?
|
|
@@ -32,14 +43,20 @@ class THEOplayerRCTNowPlayingManager {
|
|
|
32
43
|
|
|
33
44
|
// clear nowPlayingInfo
|
|
34
45
|
self.clearNowPlayingInfoStorage()
|
|
35
|
-
self.
|
|
46
|
+
if self.mediaSessionEnabled {
|
|
47
|
+
self.clearNowPlayingInfoOnInfoCenter()
|
|
48
|
+
} else {
|
|
49
|
+
// Disabled player being destroyed: still clean up, but only if it owns the shared info.
|
|
50
|
+
self.clearNowPlayingIfOwner()
|
|
51
|
+
}
|
|
36
52
|
|
|
37
53
|
if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] Destroy, nowPlayingInfo cleared on infoCenter.") }
|
|
38
54
|
}
|
|
39
55
|
|
|
40
56
|
// MARK: - player setup / breakdown
|
|
41
|
-
func setPlayer(_ player: THEOplayer) {
|
|
57
|
+
func setPlayer(_ player: THEOplayer, view: THEOplayerRCTView?) {
|
|
42
58
|
self.player = player;
|
|
59
|
+
self.view = view
|
|
43
60
|
|
|
44
61
|
// attach listeners
|
|
45
62
|
self.attachListeners()
|
|
@@ -67,6 +84,13 @@ class THEOplayerRCTNowPlayingManager {
|
|
|
67
84
|
// Reset any existing playing info; this invalidates any artwork fetch still in flight
|
|
68
85
|
let generation = self.clearNowPlayingInfoStorage()
|
|
69
86
|
|
|
87
|
+
// When the media session is disabled we must not publish, nor unconditionally clear (that would
|
|
88
|
+
// clobber another active owner). Only clear if this player currently owns the shared info.
|
|
89
|
+
guard self.mediaSessionEnabled else {
|
|
90
|
+
self.clearNowPlayingIfOwner()
|
|
91
|
+
return
|
|
92
|
+
}
|
|
93
|
+
|
|
70
94
|
// Gather new playing info
|
|
71
95
|
if let player = self.player,
|
|
72
96
|
let sourceDescription = player.source,
|
|
@@ -78,7 +102,7 @@ class THEOplayerRCTNowPlayingManager {
|
|
|
78
102
|
self.updateAlbum(metadata.metadataKeys?["album"] as? String)
|
|
79
103
|
self.updateDuration(player.duration)
|
|
80
104
|
self.updateMediaType() // video
|
|
81
|
-
self.updatePlaybackRate(player.playbackRate)
|
|
105
|
+
self.updatePlaybackRate(player.paused ? 0 : player.playbackRate)
|
|
82
106
|
self.updateServiceIdentifier(metadata.metadataKeys?["nowPlayingServiceIdentifier"] as? String)
|
|
83
107
|
self.updateContentIdentifier(metadata.metadataKeys?["nowPlayingContentIdentifier"] as? String)
|
|
84
108
|
self.updateCurrentTime(player.currentTime)
|
|
@@ -133,8 +157,11 @@ class THEOplayerRCTNowPlayingManager {
|
|
|
133
157
|
}
|
|
134
158
|
|
|
135
159
|
private func processNowPlayingInfoToInfoCenter() {
|
|
160
|
+
guard self.mediaSessionEnabled else { return }
|
|
136
161
|
let nowPlayingInfo = self.getNowPlayingInfoStorage()
|
|
137
162
|
if !nowPlayingInfo.isEmpty {
|
|
163
|
+
// This player is now publishing to the shared info center: claim ownership.
|
|
164
|
+
THEOplayerRCTNowPlayingManager.currentOwner = self
|
|
138
165
|
Task { @MainActor in
|
|
139
166
|
MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
|
|
140
167
|
if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] nowPlayingInfo processed to infoCenter.") }
|
|
@@ -149,7 +176,26 @@ class THEOplayerRCTNowPlayingManager {
|
|
|
149
176
|
}
|
|
150
177
|
|
|
151
178
|
private func clearNowPlayingInfoOnInfoCenter() {
|
|
179
|
+
guard self.mediaSessionEnabled else { return }
|
|
180
|
+
if THEOplayerRCTNowPlayingManager.currentOwner === self {
|
|
181
|
+
THEOplayerRCTNowPlayingManager.currentOwner = nil
|
|
182
|
+
}
|
|
183
|
+
self.performClearOnInfoCenter()
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
/// Clear the shared Now Playing info only if this player currently owns it. Bypasses the
|
|
187
|
+
/// mediaSessionEnabled guard so a player can clean up its own info at the moment it is disabled,
|
|
188
|
+
/// without clobbering another (newly-active) owner during a multi-player hand-off.
|
|
189
|
+
private func clearNowPlayingIfOwner() {
|
|
190
|
+
guard THEOplayerRCTNowPlayingManager.currentOwner === self else { return }
|
|
191
|
+
THEOplayerRCTNowPlayingManager.currentOwner = nil
|
|
192
|
+
self.performClearOnInfoCenter()
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
private func performClearOnInfoCenter() {
|
|
152
196
|
Task { @MainActor in
|
|
197
|
+
// Avoid redundant clears (and their log noise) when the info center is already empty.
|
|
198
|
+
guard MPNowPlayingInfoCenter.default().nowPlayingInfo?.isEmpty == false else { return }
|
|
153
199
|
MPNowPlayingInfoCenter.default().nowPlayingInfo = nil
|
|
154
200
|
if DEBUG_NOWINFO { PrintUtils.printLog(logText: "[NATIVE][NOWPLAYINGINFO] clearing nowPlayingInfo (to nil) on infoCenter.") }
|
|
155
201
|
|
|
@@ -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
|
}
|