react-native-theoplayer 7.0.0 → 7.1.0

package/src/api/media/MediaControlConfiguration.ts

@@ -20,7 +20,27 @@ export interface MediaControlConfiguration {
    * @defaultValue `true`
    *
    * @remarks
-   * <br/> - This only applies to Web.
+   * <br/> - This property only applies to Web and Android.
    */
   readonly mediaSessionEnabled?: boolean;
+
+  /**
+   * The amount of seconds the player will skip forward.
+   *
+   * @defaultValue 5
+   *
+   * @remarks
+   * <br/> - This property only applies to Web and Android.
+   */
+  readonly skipForwardInterval?: number;
+
+  /**
+   * The amount of seconds the player will skip backward.
+   *
+   * @defaultValue 5
+   *
+   * @remarks
+   * <br/> - This property only applies to Web and Android.
+   */
+  readonly skipBackwardInterval?: number;
 }

package/src/internal/THEOplayerView.web.tsx

@@ -13,13 +13,26 @@ export function THEOplayerView(props: React.PropsWithChildren<THEOplayerViewProp
     // Create player inside container.
     if (container.current) {
       const chromeless = config?.chromeless === true || config?.chromeless === undefined;
-      const updatedConfig = { ...config, allowNativeFullscreen: true };
+      const ads = {
+        ...config?.ads,
+        googleIma: {
+          useNativeIma: true,
+          language: config?.ui?.language ?? 'en',
+        },
+      };
+      const updatedConfig = {
+        ...config,
+        allowNativeFullscreen: true,
+        ads,
+      };
       if (chromeless) {
         player.current = new ChromelessPlayer(container.current, updatedConfig);
       } else {
         player.current = new Player(container.current, {
           ...updatedConfig,
+          ads,
           ui: {
+            ...config?.ui,
             fluid: true,
           },
         } as PlayerConfiguration);

package/src/internal/adapter/THEOplayerWebAdapter.ts

@@ -58,7 +58,7 @@ export class THEOplayerWebAdapter extends DefaultEventDispatcher<PlayerEventMap>
 
     // Optionally create a media session connector
     if (config?.mediaControl?.mediaSessionEnabled !== false) {
-      this._mediaSession = new WebMediaSession(this, player);
+      this._mediaSession = new WebMediaSession(this, player, config?.mediaControl);
     }
   }
 

package/src/internal/adapter/web/WebMediaSession.ts

@@ -1,13 +1,15 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
 import type { ChromelessPlayer } from 'theoplayer';
 import type { THEOplayerWebAdapter } from '../THEOplayerWebAdapter';
+import { MediaControlConfiguration } from 'react-native-theoplayer';
 
-interface WebMediaSessionConfig {
-  skipTime: number;
-}
+const DEFAULT_SKIP_FORWARD_INTERVAL = 5;
+const DEFAULT_SKIP_BACKWARD_INTERVAL = 5;
 
-export const defaultWebMediaSessionConfig: WebMediaSessionConfig = {
-  skipTime: 15,
+export const defaultMediaControlConfiguration: MediaControlConfiguration = {
+  mediaSessionEnabled: true,
+  skipForwardInterval: DEFAULT_SKIP_FORWARD_INTERVAL,
+  skipBackwardInterval: DEFAULT_SKIP_BACKWARD_INTERVAL,
 };
 
 const NoOp = () => {};
@@ -28,11 +30,11 @@ const mediaSession = (function () {
  * @link https://w3c.github.io/mediasession
  */
 export class WebMediaSession {
-  private readonly _config: WebMediaSessionConfig;
+  private readonly _config: MediaControlConfiguration;
   private readonly _player: ChromelessPlayer;
   private readonly _webAdapter: THEOplayerWebAdapter;
 
-  constructor(adapter: THEOplayerWebAdapter, player: ChromelessPlayer, config: WebMediaSessionConfig = defaultWebMediaSessionConfig) {
+  constructor(adapter: THEOplayerWebAdapter, player: ChromelessPlayer, config: MediaControlConfiguration = defaultMediaControlConfiguration) {
     this._player = player;
     this._webAdapter = adapter;
     this._config = config;
@@ -48,11 +50,11 @@ export class WebMediaSession {
   updateActionHandlers() {
     if (this.isTrickplayEnabled()) {
       mediaSession.setActionHandler('seekbackward', (event) => {
-        const skipTime = event.seekOffset || this._config.skipTime;
+        const skipTime = event.seekOffset || this._config.skipBackwardInterval || DEFAULT_SKIP_BACKWARD_INTERVAL;
         this._player.currentTime = Math.max(this._player.currentTime - skipTime, 0);
       });
       mediaSession.setActionHandler('seekforward', (event) => {
-        const skipTime = event.seekOffset || this._config.skipTime;
+        const skipTime = event.seekOffset || this._config.skipForwardInterval || DEFAULT_SKIP_FORWARD_INTERVAL;
         this._player.currentTime = Math.min(this._player.currentTime + skipTime, this._player.duration);
       });
     } else {