expo-libvlc-player 7.1.3 → 7.1.5

package/README.md

@@ -16,7 +16,7 @@
 </p>
 
 <p align="center">
-  <i>Screenshots taken from the <a href="example/App.tsx">Example App</a> on Android and iOS</i>
+  <i>Screenshots taken from the <a href="example">Example App</a> on Android and iOS</i>
 </p>
 
 ### Supported versions
@@ -109,7 +109,7 @@ import LibVlcPlayerModule from "expo-libvlc-player";
 LibVlcPlayerModule.isPictureInPictureSupported();
 ```
 
-See the [Example App](example/App.tsx) for additional usage.
+_See the [Example App](example) for additional usage._
 
 ### Module methods
 

package/android/build.gradle

@@ -1,22 +1,22 @@
 import groovy.json.JsonSlurper
 
 plugins {
-  id 'com.android.library'
-  id 'expo-module-gradle-plugin'
+  id "com.android.library"
+  id "expo-module-gradle-plugin"
 }
 
 def pkg = new JsonSlurper().parse(file("$projectDir/../package.json"))
 
-group = 'expo.modules.libvlcplayer'
+group = "expo.modules.libvlcplayer"
 version = pkg.version
 
 android {
-  namespace 'expo.modules.libvlcplayer'
+  namespace "expo.modules.libvlcplayer"
 
   defaultConfig {
     versionCode 1
     versionName pkg.version
-    consumerProguardFiles('proguard-rules.pro')
+    consumerProguardFiles("proguard-rules.pro")
   }
 
   lintOptions {
@@ -29,5 +29,5 @@ repositories {
 }
 
 dependencies {
-  implementation 'org.videolan.android:libvlc-all:3.7.5'
+  implementation "org.videolan.android:libvlc-all:3.7.5"
 }

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

@@ -63,6 +63,7 @@ class LibVlcPlayerView(
 
     var firstPlay: Boolean = true
     private var shouldInit: Boolean = true
+    var shouldRepeat: Boolean = true
 
     val onBuffering by EventDispatcher()
     val onPlaying by EventDispatcher<Unit>()
@@ -183,6 +184,7 @@ class LibVlcPlayerView(
         mediaPlayer = MediaPlayer(libVLC!!)
         attachPlayerLayout(playerLayout)
         setPlayerListener(mediaPlayer!!)
+        addPlayerSlaves(slaves)
         setupPlayer()
 
         try {
@@ -328,8 +330,6 @@ class LibVlcPlayerView(
     fun setupPlayer() {
         post {
             mediaPlayer?.let { player ->
-                addPlayerSlaves(slaves)
-
                 if (scale != MediaPlayerConstants.DEFAULT_PLAYER_SCALE) {
                     player.setScale(scale.toFloat())
                 }
@@ -467,16 +467,16 @@ class LibVlcPlayerView(
     var volume: Int = MediaPlayerConstants.MAX_PLAYER_VOLUME
         set(value) {
             val oldValue = field
-            field = value
-
-            if (mute) return
-
             val newVolume =
                 value.coerceIn(
                     MediaPlayerConstants.MIN_PLAYER_VOLUME,
                     MediaPlayerConstants.MAX_PLAYER_VOLUME,
                 )
 
+            field = newVolume
+
+            if (mute) return
+
             mediaPlayer?.setVolume(newVolume)
 
             val hadVolume = oldValue > MediaPlayerConstants.MIN_PLAYER_VOLUME
@@ -558,6 +558,7 @@ class LibVlcPlayerView(
     }
 
     fun stop() {
+        shouldRepeat = false
         mediaPlayer?.stop()
     }
 
@@ -712,6 +713,8 @@ fun LibVlcPlayerView.setPlayerListener(mediaPlayer: MediaPlayer?) {
                             onPlaying(Unit)
 
                             if (firstPlay) {
+                                setupPlayer()
+
                                 setPlayerTracks()
 
                                 retryUntil { isLastAttempt ->
@@ -754,9 +757,11 @@ fun LibVlcPlayerView.setPlayerListener(mediaPlayer: MediaPlayer?) {
 
                             firstPlay = true
 
-                            if (repeat) {
+                            if (repeat && shouldRepeat) {
                                 player.play()
                             }
+
+                            shouldRepeat = true
                         }
 
                         MediaPlayerManager.keepAwakeManager.toggleKeepAwake()
@@ -862,7 +867,7 @@ private fun MutableList<String>.normalizeOptions() {
     val normalized =
         map { option ->
             if (!option.startsWith(":")) {
-                ":" + option.dropWhile { character -> character == '-' }
+                ":" + option.dropWhile { character -> character == "-" }
             } else {
                 option
             }

package/ios/ExpoLibVlcPlayer.podspec

@@ -1,29 +1,29 @@
-require 'json'
+require "json"
 
-package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
+package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
 
 Pod::Spec.new do |s|
-  s.name           = 'ExpoLibVlcPlayer'
-  s.version        = package['version']
-  s.summary        = package['description']
-  s.description    = package['description']
-  s.license        = package['license']
-  s.author         = package['author']
-  s.homepage       = package['homepage']
+  s.name           = "ExpoLibVlcPlayer"
+  s.version        = package["version"]
+  s.summary        = package["description"]
+  s.description    = package["description"]
+  s.license        = package["license"]
+  s.author         = package["author"]
+  s.homepage       = package["homepage"]
   s.platforms      = {
-    :ios => '15.1',
-    :tvos => '15.1',
+    :ios => "15.1",
+    :tvos => "15.1",
   }
-  s.swift_version  = '5.9'
-  s.source         = { git: 'https://github.com/cornejobarraza/expo-libvlc-player' }
+  s.swift_version  = "5.9"
+  s.source         = { git: "https://github.com/cornejobarraza/expo-libvlc-player" }
   s.static_framework = true
 
-  s.dependency 'ExpoModulesCore'
-  s.dependency 'VLCKit', '4.0.0a20'
+  s.dependency "ExpoModulesCore"
+  s.dependency "VLCKit", "4.0.0a20"
 
   # Swift/Objective-C compatibility
   s.pod_target_xcconfig = {
-    'DEFINES_MODULE' => 'YES',
+    "DEFINES_MODULE" => "YES",
   }
 
   s.source_files = "**/*.{h,m,mm,swift,hpp,cpp}"

package/ios/LibVlcPlayerModule.swift

@@ -91,8 +91,8 @@ public class LibVlcPlayerModule: Module {
                 view.audioMixingMode = audioMixingMode
             }
 
-            Prop("repeat", false) { (view: LibVlcPlayerView, shouldRepeat: Bool) in
-                view.shouldRepeat = shouldRepeat
+            Prop("repeat", false) { (view: LibVlcPlayerView, Repeat: Bool) in
+                view.Repeat = Repeat
             }
 
             Prop("autoplay", true) { (view: LibVlcPlayerView, autoplay: Bool) in

package/ios/LibVlcPlayerView.swift

@@ -17,6 +17,7 @@ class LibVlcPlayerView: ExpoView {
 
     var firstPlay: Bool = true
     private var shouldInit: Bool = true
+    private var shouldRepeat: Bool = true
 
     let onBuffering = EventDispatcher()
     let onPlaying = EventDispatcher()
@@ -80,6 +81,7 @@ class LibVlcPlayerView: ExpoView {
         mediaPlayer = VLCMediaPlayer(library: library!)
         mediaPlayer!.drawable = drawable
         mediaPlayer!.delegate = self
+        addPlayerSlaves(slaves)
         setupPlayer()
 
         vlcDialog = VLCDialogProvider(library: library!, customUI: dialogCustomUI)
@@ -202,8 +204,6 @@ class LibVlcPlayerView: ExpoView {
             guard let self else { return }
 
             if let player = mediaPlayer {
-                addPlayerSlaves(slaves)
-
                 if scale != MediaPlayerConstants.defaultPlayerScale {
                     player.scaleFactor = Float(scale)
                 }
@@ -357,15 +357,21 @@ class LibVlcPlayerView: ExpoView {
 
     var time: Int = MediaPlayerConstants.defaultPlayerTime
 
-    var volume: Int = MediaPlayerConstants.maxPlayerVolume {
-        didSet {
-            if mute { return }
+    var _volume: Int = MediaPlayerConstants.maxPlayerVolume
 
+    var volume: Int {
+        get { _volume }
+        set {
+            let oldValue = _volume
             let newVolume = max(
                 MediaPlayerConstants.minPlayerVolume,
-                min(MediaPlayerConstants.maxPlayerVolume, volume)
+                min(MediaPlayerConstants.maxPlayerVolume, newValue)
             )
 
+            _volume = newVolume
+
+            if mute { return }
+
             mediaPlayer?.audio?.volume = Int32(newVolume)
 
             let hadVolume = oldValue > MediaPlayerConstants.minPlayerVolume
@@ -398,7 +404,7 @@ class LibVlcPlayerView: ExpoView {
         }
     }
 
-    var shouldRepeat: Bool = false
+    var Repeat: Bool = false
 
     var autoplay: Bool = true
 
@@ -428,6 +434,7 @@ class LibVlcPlayerView: ExpoView {
     }
 
     func stop() {
+        shouldRepeat = false
         mediaPlayer?.stop()
     }
 
@@ -547,6 +554,8 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                     onPlaying()
 
                     if firstPlay {
+                        setupPlayer()
+
                         setPlayerTracks()
 
                         retryUntil { [weak self] isLastAttempt in
@@ -593,9 +602,11 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
 
                     firstPlay = true
 
-                    if shouldRepeat {
+                    if Repeat, shouldRepeat {
                         player.play()
                     }
+
+                    shouldRepeat = true
                 }
 
                 MediaPlayerManager.shared.keepAwakeManager.toggleKeepAwake()

package/package.json

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