expo-libvlc-player 2.0.11 → 2.0.13

package/README.md

@@ -135,7 +135,7 @@ The `LibVlcPlayerView` extends React Native `ViewProps` and implements the follo
 | `volume`           | Sets the player volume. Must be an integer between `0` and `100`                                                                  | `100`       |
 | `mute`             | Sets the player volume to `0` when `true`. Previous value is set when `false`                                                     | `false`     |
 | `audioMixingMode`  | Determines how the player will interact with other audio in the system                                                            | `"auto"`    |
-| `playInBackground` | Determines whether the player should continue playing in the background                                                           | `false`     |
+| `playInBackground` | Determines whether the media should continue playing in the background                                                            | `false`     |
 | `autoplay`         | Determines whether the media should autoplay once created                                                                         | `true`      |
 | `repeat`           | Determines whether the media should repeat once ended                                                                             | `false`     |
 
@@ -211,8 +211,8 @@ The `LibVlcPlayerView` extends React Native `ViewProps` and implements the follo
 
 This project is not affiliated with, endorsed by, or officially supported by VideoLAN. The VLC icon is trademark of VideoLAN and is used here solely to indicate compatibility with the following **LibVLC** bindings:
 
-- `libvlcjni v3.6.2` for Android
-- `MobileVLCKit v3.6.0` for iOS
+- `libvlcjni` for Android
+- `MobileVLCKit` for iOS
 
 For official VLC products and support, please visit [videolan.org](https://www.videolan.org/).
 

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: "com.android.library"
 
 group = "expo.modules.libvlcplayer"
-version = "2.0.11"
+version = "2.0.13"
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -27,7 +27,7 @@ android {
     namespace "expo.modules.libvlcplayer"
     defaultConfig {
         versionCode 1
-        versionName "2.0.11"
+        versionName "2.0.13"
         consumerProguardFiles("proguard-rules.pro")
     }
     lintOptions {

package/android/src/main/java/expo/modules/libvlcplayer/LibVlcPlayerView.kt

@@ -103,9 +103,7 @@ class LibVlcPlayerView(
 
         addPlayerSlaves()
 
-        if (autoplay) {
-            mediaPlayer!!.play()
-        }
+        mediaPlayer!!.play()
 
         shouldCreate = false
         firstPlay = true
@@ -302,7 +300,7 @@ class LibVlcPlayerView(
 
     var slaves: ArrayList<Slave> = ArrayList()
         set(value) {
-            val newSlaves = value.filter { it !in field }
+            val newSlaves = value.filter { slave -> slave !in field }
 
             field = field.apply { addAll(newSlaves) }
 
@@ -383,6 +381,15 @@ class LibVlcPlayerView(
         }
 
     var autoplay: Boolean = true
+        set(value) {
+            field = value
+
+            options.removeStartPausedOption()
+
+            if (!value) {
+                options.add("--start-paused")
+            }
+        }
 
     var repeat: Boolean = false
         set(value) {
@@ -395,7 +402,13 @@ class LibVlcPlayerView(
         }
 
     fun play() {
-        mediaPlayer?.play()
+        mediaPlayer?.let { player ->
+            if (options.hasStartPausedOption()) {
+                player.play()
+            }
+
+            player.play()
+        }
     }
 
     fun pause() {
@@ -424,7 +437,7 @@ class LibVlcPlayerView(
                 ":no-audio",
             )
 
-        return this.any { it in options }
+        return this.any { option -> option in options }
     }
 
     internal fun ArrayList<String>.hasRepeatOption(): Boolean {
@@ -435,10 +448,32 @@ class LibVlcPlayerView(
                 ":input-repeat=",
             )
 
-        return this.any { arg ->
-            options.any { option ->
-                arg.startsWith(option)
+        return this.any { option ->
+            options.any { value ->
+                option.startsWith(value)
             }
         }
     }
+
+    internal fun ArrayList<String>.hasStartPausedOption(): Boolean {
+        val options =
+            setOf(
+                "--start-paused",
+                "-start-paused",
+                ":start-paused",
+            )
+
+        return this.any { option -> option in options }
+    }
+
+    internal fun ArrayList<String>.removeStartPausedOption() {
+        val options =
+            setOf(
+                "--start-paused",
+                "-start-paused",
+                ":start-paused",
+            )
+
+        this.removeAll(options)
+    }
 }

package/build/LibVlcPlayer.types.d.ts

@@ -235,7 +235,7 @@ export interface LibVlcPlayerViewProps extends ViewProps {
      */
     audioMixingMode?: AudioMixingMode;
     /**
-     * Determines whether the player should continue playing after entering the background
+     * Determines whether the media should continue playing after entering the background
      *
      * @default false
      */

package/build/LibVlcPlayer.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"LibVlcPlayer.types.js","sourceRoot":"","sources":["../src/LibVlcPlayer.types.ts"],"names":[],"mappings":"","sourcesContent":["import type { ViewProps } from \"react-native\";\n\nexport interface LibVlcPlayerViewRef {\n  /**\n   * Starts playback of the current player\n   *\n   * @returns A promise which resolves to `void`\n   */\n  readonly play: () => Promise<void>;\n  /**\n   * Pauses playback of the current player\n   *\n   * @returns A promise which resolves to `void`\n   */\n  readonly pause: () => Promise<void>;\n  /**\n   * Stops playback of the current player\n   *\n   * @returns A promise which resolves to `void`\n   */\n  readonly stop: () => Promise<void>;\n  /**\n   * Sets the position of the current player\n   *\n   * @param position - Must be a float between `0` and `1`\n   *\n   * @returns A promise which resolves to `void`\n   */\n  readonly seek: (position: number) => Promise<void>;\n}\n\nexport type LibVlcSource = string | number | null;\n\nexport interface Tracks {\n  audio?: number;\n  video?: number;\n  subtitle?: number;\n}\n\nexport interface Slave {\n  source: NonNullable<LibVlcSource>;\n  type: \"audio\" | \"subtitle\";\n  selected?: boolean;\n}\n\nexport interface Track {\n  id: number;\n  name: string;\n}\n\nexport interface MediaTracks {\n  audio: Track[];\n  video: Track[];\n  subtitle: Track[];\n}\n\nexport interface MediaInfo {\n  width: number;\n  height: number;\n  length: number;\n  seekable: boolean;\n  tracks: MediaTracks;\n}\n\nexport type AudioMixingMode =\n  | \"mixWithOthers\"\n  | \"duckOthers\"\n  | \"auto\"\n  | \"doNotMix\";\n\n/**\n * @hidden\n */\nexport type BufferingListener = () => void;\n\n/**\n * @hidden\n */\nexport type PlayingListener = () => void;\n\n/**\n * @hidden\n */\nexport type PausedListener = () => void;\n\n/**\n * @hidden\n */\nexport type StoppedListener = () => void;\n\n/**\n * @hidden\n */\nexport type EndReachedListener = () => void;\n\n/**\n * @hidden\n */\nexport type EncounteredErrorListener = (event: { nativeEvent: Error }) => void;\n\nexport type Error = { error: string };\n\n/**\n * @hidden\n */\nexport type PositionChangedListener = (event: {\n  nativeEvent: Position;\n}) => void;\n\nexport type Position = { position: number };\n\n/**\n * @hidden\n */\nexport type ESAddedListener = (event: { nativeEvent: MediaTracks }) => void;\n\n/**\n * @hidden\n */\nexport type FirstPlayListener = (event: { nativeEvent: MediaInfo }) => void;\n\n/**\n * @hidden\n */\nexport type BackgroundListener = () => void;\n\n/**\n * @hidden\n */\nexport interface LibVlcPlayerViewNativeProps {\n  ref?: React.Ref<LibVlcPlayerViewRef>;\n  source?: LibVlcSource;\n  options?: string[];\n  tracks?: Tracks;\n  slaves?: Slave[];\n  scale?: number;\n  aspectRatio?: string | null;\n  rate?: number;\n  time?: number;\n  volume?: number;\n  mute?: boolean;\n  audioMixingMode?: AudioMixingMode;\n  playInBackground?: boolean;\n  autoplay?: boolean;\n  repeat?: boolean;\n  onBuffering?: BufferingListener;\n  onPlaying?: PlayingListener;\n  onPaused?: PausedListener;\n  onStopped?: StoppedListener;\n  onEndReached?: EndReachedListener;\n  onEncounteredError?: EncounteredErrorListener;\n  onPositionChanged?: PositionChangedListener;\n  onESAdded?: ESAddedListener;\n  onFirstPlay?: FirstPlayListener;\n  onBackground?: BackgroundListener;\n}\n\nexport interface LibVlcPlayerViewProps extends ViewProps {\n  /**\n   * Sets the source of the media to be played. Set to `null` to release the player\n   */\n  source: LibVlcSource;\n  /**\n   * Sets the VLC options to initialize the player with\n   *\n   * https://wiki.videolan.org/VLC_command-line_help/\n   *\n   * @example [\"--network-caching=1000\"]\n   *\n   * @default []\n   */\n  options?: string[];\n  /**\n   * Sets the player audio, video and subtitle tracks\n   *\n   * @example\n   * ```tsx\n   * <LibVlcPlayerView\n   *    tracks={{\n   *      audio: 0,\n   *      video: 1,\n   *      subtitle: 2,\n   *    }}\n   * />\n   * ```\n   *\n   * @default undefined\n   */\n  tracks?: Tracks;\n  /**\n   * Sets the player audio and subtitle slaves\n   *\n   * @example\n   * ```tsx\n   * <LibVlcPlayerView\n   *    slaves={[\n   *      {\n   *        source: \"file://path/to/subtitle.srt\",\n   *        type: \"subtitle\",\n   *        selected: true\n   *      },\n   *    ]}\n   * />\n   * ```\n   *\n   * @default []\n   */\n  slaves?: Slave[];\n  /**\n   * Sets the player scaling factor. Must be a float equal or greater than `0`\n   *\n   * @default 0\n   */\n  scale?: number;\n  /**\n   * Sets the player aspect ratio. Must be a valid string or `null` for default\n   *\n   * @example \"16:9\"\n   *\n   * @default undefined\n   */\n  aspectRatio?: string | null;\n  /**\n   * Sets the player rate. Must be a float equal or greater than `1`\n   *\n   * @default 1\n   */\n  rate?: number;\n  /**\n   * Sets the initial player time. Must be an integer in milliseconds\n   *\n   * @default 0\n   */\n  time?: number;\n  /**\n   * Sets the player volume. Must be an integer between `0` and `100`\n   *\n   * @default 100\n   */\n  volume?: number;\n  /**\n   * Sets the player volume to `0` when `true`. Previous value is set when `false`\n   *\n   * @default false\n   */\n  mute?: boolean;\n  /**\n   * Determines how the player will interact with other audio playing in the system\n   *\n   * @default \"auto\"\n   */\n  audioMixingMode?: AudioMixingMode;\n  /**\n   * Determines whether the player should continue playing after entering the background\n   *\n   * @default false\n   */\n  playInBackground?: boolean;\n  /**\n   * Determines whether the media should autoplay once created\n   *\n   * @default true\n   */\n  autoplay?: boolean;\n  /**\n   * Determines whether the media should repeat once ended\n   *\n   * @default false\n   */\n  repeat?: boolean;\n  /**\n   * Called after the `Buffering` player event\n   */\n  onBuffering?: () => void;\n  /**\n   * Called after the `Playing` player event\n   */\n  onPlaying?: () => void;\n  /**\n   * Called after the `Paused` player event\n   */\n  onPaused?: () => void;\n  /**\n   * Called after the `Stopped` player event\n   */\n  onStopped?: () => void;\n  /**\n   * Called after the `EndReached` player event\n   */\n  onEndReached?: () => void;\n  /**\n   * Called after the `EncounteredError` player event\n   */\n  onEncounteredError?: (event: Error) => void;\n  /**\n   * Called after the `PositionChanged` player event\n   */\n  onPositionChanged?: (event: Position) => void;\n  /**\n   * Called after the `ESAdded` player event\n   */\n  onESAdded?: (event: MediaTracks) => void;\n  /**\n   * Called after the first `Playing` player event\n   */\n  onFirstPlay?: (event: MediaInfo) => void;\n  /**\n   * Called after the player enters the background\n   */\n  onBackground?: () => void;\n}\n"]}
+{"version":3,"file":"LibVlcPlayer.types.js","sourceRoot":"","sources":["../src/LibVlcPlayer.types.ts"],"names":[],"mappings":"","sourcesContent":["import type { ViewProps } from \"react-native\";\n\nexport interface LibVlcPlayerViewRef {\n  /**\n   * Starts playback of the current player\n   *\n   * @returns A promise which resolves to `void`\n   */\n  readonly play: () => Promise<void>;\n  /**\n   * Pauses playback of the current player\n   *\n   * @returns A promise which resolves to `void`\n   */\n  readonly pause: () => Promise<void>;\n  /**\n   * Stops playback of the current player\n   *\n   * @returns A promise which resolves to `void`\n   */\n  readonly stop: () => Promise<void>;\n  /**\n   * Sets the position of the current player\n   *\n   * @param position - Must be a float between `0` and `1`\n   *\n   * @returns A promise which resolves to `void`\n   */\n  readonly seek: (position: number) => Promise<void>;\n}\n\nexport type LibVlcSource = string | number | null;\n\nexport interface Tracks {\n  audio?: number;\n  video?: number;\n  subtitle?: number;\n}\n\nexport interface Slave {\n  source: NonNullable<LibVlcSource>;\n  type: \"audio\" | \"subtitle\";\n  selected?: boolean;\n}\n\nexport interface Track {\n  id: number;\n  name: string;\n}\n\nexport interface MediaTracks {\n  audio: Track[];\n  video: Track[];\n  subtitle: Track[];\n}\n\nexport interface MediaInfo {\n  width: number;\n  height: number;\n  length: number;\n  seekable: boolean;\n  tracks: MediaTracks;\n}\n\nexport type AudioMixingMode =\n  | \"mixWithOthers\"\n  | \"duckOthers\"\n  | \"auto\"\n  | \"doNotMix\";\n\n/**\n * @hidden\n */\nexport type BufferingListener = () => void;\n\n/**\n * @hidden\n */\nexport type PlayingListener = () => void;\n\n/**\n * @hidden\n */\nexport type PausedListener = () => void;\n\n/**\n * @hidden\n */\nexport type StoppedListener = () => void;\n\n/**\n * @hidden\n */\nexport type EndReachedListener = () => void;\n\n/**\n * @hidden\n */\nexport type EncounteredErrorListener = (event: { nativeEvent: Error }) => void;\n\nexport type Error = { error: string };\n\n/**\n * @hidden\n */\nexport type PositionChangedListener = (event: {\n  nativeEvent: Position;\n}) => void;\n\nexport type Position = { position: number };\n\n/**\n * @hidden\n */\nexport type ESAddedListener = (event: { nativeEvent: MediaTracks }) => void;\n\n/**\n * @hidden\n */\nexport type FirstPlayListener = (event: { nativeEvent: MediaInfo }) => void;\n\n/**\n * @hidden\n */\nexport type BackgroundListener = () => void;\n\n/**\n * @hidden\n */\nexport interface LibVlcPlayerViewNativeProps {\n  ref?: React.Ref<LibVlcPlayerViewRef>;\n  source?: LibVlcSource;\n  options?: string[];\n  tracks?: Tracks;\n  slaves?: Slave[];\n  scale?: number;\n  aspectRatio?: string | null;\n  rate?: number;\n  time?: number;\n  volume?: number;\n  mute?: boolean;\n  audioMixingMode?: AudioMixingMode;\n  playInBackground?: boolean;\n  autoplay?: boolean;\n  repeat?: boolean;\n  onBuffering?: BufferingListener;\n  onPlaying?: PlayingListener;\n  onPaused?: PausedListener;\n  onStopped?: StoppedListener;\n  onEndReached?: EndReachedListener;\n  onEncounteredError?: EncounteredErrorListener;\n  onPositionChanged?: PositionChangedListener;\n  onESAdded?: ESAddedListener;\n  onFirstPlay?: FirstPlayListener;\n  onBackground?: BackgroundListener;\n}\n\nexport interface LibVlcPlayerViewProps extends ViewProps {\n  /**\n   * Sets the source of the media to be played. Set to `null` to release the player\n   */\n  source: LibVlcSource;\n  /**\n   * Sets the VLC options to initialize the player with\n   *\n   * https://wiki.videolan.org/VLC_command-line_help/\n   *\n   * @example [\"--network-caching=1000\"]\n   *\n   * @default []\n   */\n  options?: string[];\n  /**\n   * Sets the player audio, video and subtitle tracks\n   *\n   * @example\n   * ```tsx\n   * <LibVlcPlayerView\n   *    tracks={{\n   *      audio: 0,\n   *      video: 1,\n   *      subtitle: 2,\n   *    }}\n   * />\n   * ```\n   *\n   * @default undefined\n   */\n  tracks?: Tracks;\n  /**\n   * Sets the player audio and subtitle slaves\n   *\n   * @example\n   * ```tsx\n   * <LibVlcPlayerView\n   *    slaves={[\n   *      {\n   *        source: \"file://path/to/subtitle.srt\",\n   *        type: \"subtitle\",\n   *        selected: true\n   *      },\n   *    ]}\n   * />\n   * ```\n   *\n   * @default []\n   */\n  slaves?: Slave[];\n  /**\n   * Sets the player scaling factor. Must be a float equal or greater than `0`\n   *\n   * @default 0\n   */\n  scale?: number;\n  /**\n   * Sets the player aspect ratio. Must be a valid string or `null` for default\n   *\n   * @example \"16:9\"\n   *\n   * @default undefined\n   */\n  aspectRatio?: string | null;\n  /**\n   * Sets the player rate. Must be a float equal or greater than `1`\n   *\n   * @default 1\n   */\n  rate?: number;\n  /**\n   * Sets the initial player time. Must be an integer in milliseconds\n   *\n   * @default 0\n   */\n  time?: number;\n  /**\n   * Sets the player volume. Must be an integer between `0` and `100`\n   *\n   * @default 100\n   */\n  volume?: number;\n  /**\n   * Sets the player volume to `0` when `true`. Previous value is set when `false`\n   *\n   * @default false\n   */\n  mute?: boolean;\n  /**\n   * Determines how the player will interact with other audio playing in the system\n   *\n   * @default \"auto\"\n   */\n  audioMixingMode?: AudioMixingMode;\n  /**\n   * Determines whether the media should continue playing after entering the background\n   *\n   * @default false\n   */\n  playInBackground?: boolean;\n  /**\n   * Determines whether the media should autoplay once created\n   *\n   * @default true\n   */\n  autoplay?: boolean;\n  /**\n   * Determines whether the media should repeat once ended\n   *\n   * @default false\n   */\n  repeat?: boolean;\n  /**\n   * Called after the `Buffering` player event\n   */\n  onBuffering?: () => void;\n  /**\n   * Called after the `Playing` player event\n   */\n  onPlaying?: () => void;\n  /**\n   * Called after the `Paused` player event\n   */\n  onPaused?: () => void;\n  /**\n   * Called after the `Stopped` player event\n   */\n  onStopped?: () => void;\n  /**\n   * Called after the `EndReached` player event\n   */\n  onEndReached?: () => void;\n  /**\n   * Called after the `EncounteredError` player event\n   */\n  onEncounteredError?: (event: Error) => void;\n  /**\n   * Called after the `PositionChanged` player event\n   */\n  onPositionChanged?: (event: Position) => void;\n  /**\n   * Called after the `ESAdded` player event\n   */\n  onESAdded?: (event: MediaTracks) => void;\n  /**\n   * Called after the first `Playing` player event\n   */\n  onFirstPlay?: (event: MediaInfo) => void;\n  /**\n   * Called after the player enters the background\n   */\n  onBackground?: () => void;\n}\n"]}

package/ios/LibVlcPlayerView.swift

@@ -73,9 +73,7 @@ class LibVlcPlayerView: ExpoView {
 
         addPlayerSlaves()
 
-        if autoplay {
-            mediaPlayer!.play()
-        }
+        mediaPlayer!.play()
 
         shouldCreate = false
         firstPlay = true
@@ -249,7 +247,7 @@ class LibVlcPlayerView: ExpoView {
     var slaves: [Slave] {
         get { _slaves }
         set {
-            let newSlaves = newValue.filter { !_slaves.contains($0) }
+            let newSlaves = newValue.filter { slave in !_slaves.contains(slave) }
 
             _slaves += newSlaves
 
@@ -331,7 +329,15 @@ class LibVlcPlayerView: ExpoView {
         }
     }
 
-    var autoplay: Bool = true
+    var autoplay: Bool = true {
+        didSet {
+            options.removeStartPausedOption()
+
+            if !autoplay {
+                options.append("--start-paused")
+            }
+        }
+    }
 
     var shouldRepeat: Bool = false {
         didSet {
@@ -343,7 +349,13 @@ class LibVlcPlayerView: ExpoView {
     }
 
     func play() {
-        mediaPlayer?.play()
+        if let player = mediaPlayer {
+            if options.hasStartPausedOption() {
+                player.play()
+            }
+
+            player.play()
+        }
     }
 
     func pause() {
@@ -367,24 +379,52 @@ class LibVlcPlayerView: ExpoView {
 
 private extension Array where Element == String {
     func hasAudioOption() -> Bool {
-        let options: Set<String> = [
-            "--no-audio", "-no-audio", ":no-audio",
+        let options = [
+            "--no-audio",
+            "-no-audio",
+            ":no-audio",
         ]
 
-        return contains { arg in options.contains(arg) }
+        return contains { option in options.contains(option) }
     }
 }
 
 extension Array where Element == String {
     func hasRepeatOption() -> Bool {
-        let options: Set<String> = [
-            "--input-repeat=", "-input-repeat=", ":input-repeat=",
+        let options = [
+            "--input-repeat=",
+            "-input-repeat=",
+            ":input-repeat=",
         ]
 
-        return contains { arg in
-            options.contains { option in
-                arg.hasPrefix(option)
+        return contains { option in
+            options.contains { value in
+                option.hasPrefix(value)
             }
         }
     }
 }
+
+extension Array where Element == String {
+    func hasStartPausedOption() -> Bool {
+        let options = [
+            "--start-paused",
+            "-start-paused",
+            ":start-paused",
+        ]
+
+        return contains { option in options.contains(option) }
+    }
+}
+
+extension Array where Element == String {
+    mutating func removeStartPausedOption() {
+        let options = [
+            "--start-paused",
+            "-start-paused",
+            ":start-paused",
+        ]
+
+        removeAll { option in options.contains(option) }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-libvlc-player",
-  "version": "2.0.11",
+  "version": "2.0.13",
   "description": "LibVLC Player for Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/src/LibVlcPlayer.types.ts

@@ -251,7 +251,7 @@ export interface LibVlcPlayerViewProps extends ViewProps {
    */
   audioMixingMode?: AudioMixingMode;
   /**
-   * Determines whether the player should continue playing after entering the background
+   * Determines whether the media should continue playing after entering the background
    *
    * @default false
    */