expo-libvlc-player 0.1.1 → 0.1.3

package/README.md

@@ -43,16 +43,16 @@ See the [example app](example/App.tsx) for additional usage.
 
 ### Player methods
 
-| Prop                     | Description                           | Params                                 |
-| ------------------------ | ------------------------------------- | -------------------------------------- |
-| `play()`                 | Starts playback of the current player |                                        |
-| `pause()`                | Pauses playback of the current player |                                        |
-| `stop()`                 | Stops playback of the current player  |                                        |
-| `seek(position: number)` | Sets position of the current player   | Must be a float number between 0 and 1 |
+| Method    | Description                           | Params                                              |
+| --------- | ------------------------------------- | --------------------------------------------------- |
+| `play()`  | Starts playback of the current player |                                                     |
+| `pause()` | Pauses playback of the current player |                                                     |
+| `stop()`  | Stops playback of the current player  |                                                     |
+| `seek()`  | Sets position of the current player   | `position` - Must be a float number between 0 and 1 |
 
 ### Player props
 
-The `VLCPlayerView` extends React Native `ViewProps` and implements it's own props:
+The `VLCPlayerView` extends React Native `ViewProps` and implements it's own:
 
 | Prop               | Description                                                                               | Default  |
 | ------------------ | ----------------------------------------------------------------------------------------- | -------- |
@@ -77,11 +77,11 @@ The `VLCPlayerView` extends React Native `ViewProps` and implements it's own pro
 | `onPlaying`         | Called after the `Playing` player event          |                                                                                                               |
 | `onPaused`          | Called after the `Paused` player event           |                                                                                                               |
 | `onStopped`         | Called after the `Stopped` player event          |                                                                                                               |
+| `onPositionChanged` | Called after the `PositionChanged` player event  | `{ position: number }`                                                                                        |
 | `onEnded`           | Called after the `EndReached` player event       |                                                                                                               |
 | `onRepeat`          | Called after the player repeats the media        |                                                                                                               |
 | `onWarn`            | Called after the player encounters a conflict    | `{ warn: string }`                                                                                            |
 | `onError`           | Called after the `EncounteredError` player event | `{ error: string }`                                                                                           |
-| `onPositionChanged` | Called after the `PositionChanged` player event  | `{ position: number }`                                                                                        |
 | `onLoad`            | Called after the `Buffering` player event        | `{ width: number, height: number, aspectRatio: string, duration: number, tracks: object, seekable: boolean }` |
 | `onBackground`      | Called after the player enters the background    |                                                                                                               |
 

package/android/.idea/workspace.xml

@@ -4,7 +4,11 @@
     <option name="autoReloadType" value="NONE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ce1cf2d7-3e2c-41b3-ae06-62438ddceca7" name="Changes" comment="" />
+    <list default="true" id="ce1cf2d7-3e2c-41b3-ae06-62438ddceca7" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/src/main/java/expo/modules/libvlcplayer/VlcPlayerView.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/expo/modules/libvlcplayer/VlcPlayerView.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../example/App.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/../example/App.tsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../ios/VlcPlayerView.swift" beforeDir="false" afterPath="$PROJECT_DIR$/../ios/VlcPlayerView.swift" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -52,7 +56,7 @@
     "android.gradle.sync.needed": "true",
     "cf.first.check.clang-format": "false",
     "cidr.known.project.marker": "true",
-    "git-widget-placeholder": "0.1.0",
+    "git-widget-placeholder": "master",
     "ignore.virus.scanning.warn.message": "true",
     "kotlin-language-version-configured": "true",
     "last_opened_file_path": "//wsl.localhost/Ubuntu/home/rarbit/dev/expo-libvlc-player/android",

package/android/build.gradle

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

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

@@ -38,7 +38,7 @@ class AudioFocusManager(
             } ?: false
         }
 
-    private var previousVolume: Int = MAX_PLAYER_VOLUME
+    private var userVolume: Int = MAX_PLAYER_VOLUME
 
     private fun playerRequiresFocus(player: MediaPlayer?): Boolean {
         val mPlayer = player ?: return false
@@ -193,7 +193,7 @@ class AudioFocusManager(
             appContext.mainQueue.launch {
                 val volume = weakPlayer.getVolume() / 20
                 weakPlayer.setVolume(volume)
-                previousVolume = volume
+                userVolume = volume
             }
         }
     }
@@ -202,7 +202,7 @@ class AudioFocusManager(
         player?.let { weakPlayer ->
             if (weakPlayer.getVolume() > MIN_PLAYER_VOLUME) {
                 appContext.mainQueue.launch {
-                    weakPlayer.setVolume(previousVolume)
+                    weakPlayer.setVolume(userVolume)
                 }
             }
         }

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

@@ -96,6 +96,10 @@ class VlcPlayerModule : Module() {
                 view.setAutoplay(autoplay ?: true)
             }
 
+            OnViewDidUpdateProps { view: VlcPlayerView ->
+                view.createPlayer()
+            }
+
             OnViewDestroys { view: VlcPlayerView ->
                 VlcPlayerManager.onViewDestroyed(view)
                 VlcPlayerManager.unregisterView(view)

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

@@ -42,8 +42,9 @@ class VlcPlayerView(context: Context, appContext: AppContext) : ExpoView(context
 
     private var libVLC: LibVLC? = null
     internal var mediaPlayer: MediaPlayer? = null
+    internal var shouldCreate: Boolean = false
 
-    private var previousVolume: Int = MAX_PLAYER_VOLUME
+    private var userVolume: Int = MAX_PLAYER_VOLUME
     private var repeat: Boolean = false
     private var autoplay: Boolean = true
 
@@ -67,6 +68,8 @@ class VlcPlayerView(context: Context, appContext: AppContext) : ExpoView(context
     }
 
     fun createPlayer() {
+        if (!shouldCreate) return
+
         destroyPlayer()
 
         libVLC = LibVLC(context, options)
@@ -78,52 +81,54 @@ class VlcPlayerView(context: Context, appContext: AppContext) : ExpoView(context
                     Event.Buffering -> {
                         onBuffering(mapOf())
 
-                        val audioTracks = Arguments.createArray()
+                        if (player.getPosition() == 0f) {
+                            val audioTracks = Arguments.createArray()
 
-                        if (player.getAudioTracksCount() > 0) {
-                            val audios = player.getAudioTracks()
+                            if (player.getAudioTracksCount() > 0) {
+                                val audios = player.getAudioTracks()
 
-                            audios.forEach { track ->
-                                if (track.id == -1) return@forEach
-                                val trackMap = Arguments.createMap()
-                                trackMap.putInt("id", track.id)
-                                trackMap.putString("name", track.name)
-                                audioTracks.pushMap(trackMap)
+                                audios.forEach { track ->
+                                    if (track.id == -1) return@forEach
+                                    val trackMap = Arguments.createMap()
+                                    trackMap.putInt("id", track.id)
+                                    trackMap.putString("name", track.name)
+                                    audioTracks.pushMap(trackMap)
+                                }
                             }
-                        }
 
-                        val subtitleTracks = Arguments.createArray()
+                            val subtitleTracks = Arguments.createArray()
 
-                        if (player.getSpuTracksCount() > 0) {
-                            val subtitles = player.getSpuTracks()
+                            if (player.getSpuTracksCount() > 0) {
+                                val subtitles = player.getSpuTracks()
 
-                            subtitles.forEach { track ->
-                                val trackMap = Arguments.createMap()
-                                trackMap.putInt("id", track.id)
-                                trackMap.putString("name", track.name)
-                                subtitleTracks.pushMap(trackMap)
+                                subtitles.forEach { track ->
+                                    val trackMap = Arguments.createMap()
+                                    trackMap.putInt("id", track.id)
+                                    trackMap.putString("name", track.name)
+                                    subtitleTracks.pushMap(trackMap)
+                                }
                             }
-                        }
 
-                        val video = player.getCurrentVideoTrack()
-                        val ratio = player.getAspectRatio()
-                        val length = player.getLength()
-                        val tracks = Arguments.createMap().apply {
-                            putArray("audio", audioTracks)
-                            putArray("subtitle", subtitleTracks)
-                        }
-                        val seekable = player.isSeekable()
-
-                        val videoInfo = Arguments.createMap().apply {
-                            putInt("width", video?.width ?: 0)
-                            putInt("height", video?.height ?: 0)
-                            putString("aspectRatio", ratio)
-                            putDouble("duration", length.toDouble())
-                            putMap("tracks", tracks)
-                            putBoolean("seekable", seekable)
-                        }
+                            val video = player.getCurrentVideoTrack()
+                            val ratio = player.getAspectRatio()
+                            val length = player.getLength()
+                            val tracks = Arguments.createMap().apply {
+                                putArray("audio", audioTracks)
+                                putArray("subtitle", subtitleTracks)
+                            }
+                            val seekable = player.isSeekable()
+
+                            val videoInfo = Arguments.createMap().apply {
+                                putInt("width", video?.width ?: 0)
+                                putInt("height", video?.height ?: 0)
+                                putString("aspectRatio", ratio)
+                                putDouble("duration", length.toDouble())
+                                putMap("tracks", tracks)
+                                putBoolean("seekable", seekable)
+                            }
 
-                        onLoad(videoInfo)
+                            onLoad(videoInfo)
+                        }
                     }
 
                     Event.Playing -> {
@@ -144,6 +149,11 @@ class VlcPlayerView(context: Context, appContext: AppContext) : ExpoView(context
                         onPositionChanged(mapOf("position" to position))
                     }
 
+                    Event.PositionChanged -> {
+                        val position = mapOf("position" to event.positionChanged)
+                        onPositionChanged(position)
+                    }
+
                     Event.EndReached -> {
                         onEnded(mapOf())
 
@@ -160,11 +170,6 @@ class VlcPlayerView(context: Context, appContext: AppContext) : ExpoView(context
                         val error = mapOf("error" to "Player encountered an error")
                         onError(error)
                     }
-
-                    Event.PositionChanged -> {
-                        val position = mapOf("position" to event.positionChanged)
-                        onPositionChanged(position)
-                    }
                 }
             })
 
@@ -182,6 +187,8 @@ class VlcPlayerView(context: Context, appContext: AppContext) : ExpoView(context
                 player.play()
             }
         }
+
+        shouldCreate = false
     }
 
     fun destroyPlayer() {
@@ -198,9 +205,7 @@ class VlcPlayerView(context: Context, appContext: AppContext) : ExpoView(context
             val old = field
             field = value
 
-            if (value != old) {
-                createPlayer()
-            }
+            shouldCreate = value != old
         }
 
     fun setSubtitle(subtitle: ReadableMap?) {
@@ -224,14 +229,12 @@ class VlcPlayerView(context: Context, appContext: AppContext) : ExpoView(context
             val old = field
             field = value
 
-            if (value != old) {
-                createPlayer()
-            }
+            shouldCreate = value != old
         }
 
     fun setVolume(volume: Int) {
         val newVolume = volume.coerceIn(MIN_PLAYER_VOLUME, MAX_PLAYER_VOLUME)
-        previousVolume = newVolume
+        userVolume = newVolume
 
         mediaPlayer?.setVolume(newVolume)
         audioFocusManager.updateAudioFocus()
@@ -239,7 +242,7 @@ class VlcPlayerView(context: Context, appContext: AppContext) : ExpoView(context
 
     fun setMute(mute: Boolean) {
         val newVolume = if (!mute) {
-            previousVolume.coerceIn(PLAYER_VOLUME_STEP, MAX_PLAYER_VOLUME)
+            userVolume.coerceIn(PLAYER_VOLUME_STEP, MAX_PLAYER_VOLUME)
         } else {
             MIN_PLAYER_VOLUME
         }

package/ios/VlcPlayerModule.swift

@@ -86,6 +86,10 @@ public class VlcPlayerModule: Module {
                 view.setAutoplay(autoplay ?? true)
             }
 
+            OnViewDidUpdateProps { (view: VlcPlayerView) in
+                view.createPlayer()
+            }
+
             AsyncFunction("play") { (view: VlcPlayerView) in
                 view.play()
             }

package/ios/VlcPlayerView.swift

@@ -12,10 +12,11 @@ private let enableSubtitles = true
 
 class VlcPlayerView: ExpoView, VLCMediaPlayerDelegate {
     var mediaPlayer: VLCMediaPlayer?
+    var shouldCreate: Bool = false
 
     private var uri: String = ""
     private var options: [String] = []
-    private var previousVolume: Int = maxPlayerVolume
+    private var userVolume: Int = maxPlayerVolume
     private var shouldRepeat: Bool = false
     var audioMixingMode: AudioMixingMode = .auto
     var playInBackground: Bool = false
@@ -43,6 +44,33 @@ class VlcPlayerView: ExpoView, VLCMediaPlayerDelegate {
         clipsToBounds = true
     }
 
+    func createPlayer() {
+        if !shouldCreate { return }
+
+        destroyPlayer()
+
+        mediaPlayer = VLCMediaPlayer(options: options)
+
+        if let player = mediaPlayer {
+            player.delegate = self
+            player.drawable = self
+
+            guard let url = URL(string: uri) else {
+                let error = ["error": "Invalid URI, media could not be set"]
+                onError(error)
+                return
+            }
+
+            player.media = VLCMedia(url: url)
+
+            if autoplay {
+                player.play()
+            }
+        }
+
+        shouldCreate = false
+    }
+
     func mediaPlayerStateChanged(_: Notification) {
         guard let player = mediaPlayer else { return }
 
@@ -50,58 +78,60 @@ class VlcPlayerView: ExpoView, VLCMediaPlayerDelegate {
         case .buffering:
             onBuffering([:])
 
-            var audioTracks: [[String: Any]] = []
+            if player.position == 0.0 {
+                var audioTracks: [[String: Any]] = []
+
+                if let audios = player.audioTrackNames as? [String] {
+                    if let audioIndexes = player.audioTrackIndexes as? [NSNumber] {
+                        for (index, name) in audios.enumerated() {
+                            let trackId = audioIndexes[index].intValue
+                            if trackId != -1 && name != "Disable" {
+                                audioTracks.append([
+                                    "id": trackId,
+                                    "name": name,
+                                ])
+                            }
+                        }
+                    }
+                }
+
+                var subtitleTracks: [[String: Any]] = []
 
-            if let audios = player.audioTrackNames as? [String] {
-                if let audioIndexes = player.audioTrackIndexes as? [NSNumber] {
-                    for (index, name) in audios.enumerated() {
-                        let trackId = audioIndexes[index].intValue
-                        if trackId != -1 && name != "Disable" {
-                            audioTracks.append([
+                if let subtitles = player.videoSubTitlesNames as? [String] {
+                    if let subtitleIndexes = player.videoSubTitlesIndexes as? [NSNumber] {
+                        for (index, name) in subtitles.enumerated() {
+                            let trackId = subtitleIndexes[index].intValue
+                            subtitleTracks.append([
                                 "id": trackId,
                                 "name": name,
                             ])
                         }
                     }
                 }
-            }
 
-            var subtitleTracks: [[String: Any]] = []
-
-            if let subtitles = player.videoSubTitlesNames as? [String] {
-                if let subtitleIndexes = player.videoSubTitlesIndexes as? [NSNumber] {
-                    for (index, name) in subtitles.enumerated() {
-                        let trackId = subtitleIndexes[index].intValue
-                        subtitleTracks.append([
-                            "id": trackId,
-                            "name": name,
-                        ])
-                    }
+                let video = player.videoSize
+                let ratio = player.videoAspectRatio
+                var length = 0
+                if let media = player.media {
+                    length = Int(media.length.intValue)
                 }
+                let tracks = [
+                    "audio": audioTracks,
+                    "subtitle": subtitleTracks,
+                ]
+                let seekable = player.isSeekable
+
+                let videoInfo: [String: Any] = [
+                    "width": Int(video.width),
+                    "height": Int(video.height),
+                    "aspectRatio": ratio,
+                    "duration": Double(length),
+                    "tracks": tracks,
+                    "seekable": seekable,
+                ]
+
+                onLoad(videoInfo)
             }
-
-            let video = player.videoSize
-            let ratio = player.videoAspectRatio
-            var length = 0
-            if let media = player.media {
-                length = Int(media.length.intValue)
-            }
-            let tracks = [
-                "audio": audioTracks,
-                "subtitle": subtitleTracks,
-            ]
-            let seekable = player.isSeekable
-
-            let videoInfo: [String: Any] = [
-                "width": Int(video.width),
-                "height": Int(video.height),
-                "aspectRatio": ratio,
-                "duration": Double(length),
-                "tracks": tracks,
-                "seekable": seekable,
-            ]
-
-            onLoad(videoInfo)
         case .playing:
             onPlaying([:])
             VlcPlayerManager.shared.setAppropriateAudioSessionOrWarn()
@@ -139,29 +169,6 @@ class VlcPlayerView: ExpoView, VLCMediaPlayerDelegate {
         onPositionChanged(position)
     }
 
-    func createPlayer() {
-        destroyPlayer()
-
-        mediaPlayer = VLCMediaPlayer(options: options)
-
-        if let player = mediaPlayer {
-            player.delegate = self
-            player.drawable = self
-
-            guard let url = URL(string: uri) else {
-                let error = ["error": "Invalid URI, media could not be set"]
-                onError(error)
-                return
-            }
-
-            player.media = VLCMedia(url: url)
-
-            if autoplay {
-                player.play()
-            }
-        }
-    }
-
     func destroyPlayer() {
         if let player = mediaPlayer {
             player.stop()
@@ -173,9 +180,7 @@ class VlcPlayerView: ExpoView, VLCMediaPlayerDelegate {
         let old = self.uri
         self.uri = uri
 
-        if uri != old {
-            createPlayer()
-        }
+        shouldCreate = uri != old
     }
 
     func setSubtitle(_ subtitle: [String: Any]?) {
@@ -200,16 +205,14 @@ class VlcPlayerView: ExpoView, VLCMediaPlayerDelegate {
         let old = self.options
         self.options = options
 
-        if options != old {
-            createPlayer()
-        }
+        shouldCreate = options != old
     }
 
     func setVolume(_ volume: Int) {
         guard let player = mediaPlayer else { return }
 
         let newVolume = max(minPlayerVolume, min(maxPlayerVolume, volume))
-        previousVolume = newVolume
+        userVolume = newVolume
 
         player.audio?.volume = Int32(newVolume)
         VlcPlayerManager.shared.setAppropriateAudioSessionOrWarn()
@@ -219,7 +222,7 @@ class VlcPlayerView: ExpoView, VLCMediaPlayerDelegate {
         guard let player = mediaPlayer else { return }
 
         let newVolume = !mute ?
-            max(playerVolumeStep, min(maxPlayerVolume, previousVolume)) :
+            max(playerVolumeStep, min(maxPlayerVolume, userVolume)) :
             minPlayerVolume
 
         player.audio?.volume = Int32(newVolume)

package/package.json

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