expo-libvlc-player 0.1.26 → 0.1.28

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'expo.modules.libvlcplayer'
-version = '0.1.25'
+version = '0.1.27'
 
 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 "0.1.25"
+        versionName "0.1.27"
         consumerProguardFiles("proguard-rules.pro")
     }
     lintOptions {

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

@@ -23,7 +23,6 @@ class AudioFocusManager(
     }
 
     private var currentFocusRequest: AudioFocusRequest? = null
-    private var currentMixingMode: AudioMixingMode = AudioMixingMode.MIX_WITH_OTHERS
     private val anyPlayerRequiresFocus: Boolean
         get() =
             views.toList().any { weakView ->
@@ -44,7 +43,7 @@ class AudioFocusManager(
             }
 
         if (mixingModes.isEmpty()) {
-            return AudioMixingMode.MIX_WITH_OTHERS
+            return AudioMixingMode.AUTO
         }
 
         return mixingModes.reduce { currentAudioMixingMode, next ->
@@ -57,15 +56,13 @@ class AudioFocusManager(
 
         if (audioMixingMode == AudioMixingMode.MIX_WITH_OTHERS || !anyPlayerRequiresFocus) {
             abandonAudioFocus()
-            currentMixingMode = audioMixingMode
             return
         }
 
         val audioFocusType =
-            when (currentMixingMode) {
+            when (audioMixingMode) {
                 AudioMixingMode.DUCK_OTHERS -> AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK
-                AudioMixingMode.AUTO -> AudioManager.AUDIOFOCUS_GAIN
-                AudioMixingMode.DO_NOT_MIX -> AudioManager.AUDIOFOCUS_GAIN
+                AudioMixingMode.AUTO, AudioMixingMode.DO_NOT_MIX -> AudioManager.AUDIOFOCUS_GAIN
                 else -> AudioManager.AUDIOFOCUS_GAIN
             }
 
@@ -94,8 +91,6 @@ class AudioFocusManager(
             @Suppress("DEPRECATION")
             audioManager.requestAudioFocus(this, AudioManager.STREAM_MUSIC, audioFocusType)
         }
-
-        currentMixingMode = audioMixingMode
     }
 
     private fun abandonAudioFocus() {
@@ -112,7 +107,7 @@ class AudioFocusManager(
     }
 
     fun updateAudioFocus() {
-        if (anyPlayerRequiresFocus || findAudioMixingMode() != currentMixingMode) {
+        if (anyPlayerRequiresFocus) {
             requestAudioFocus()
         } else {
             abandonAudioFocus()
@@ -157,11 +152,9 @@ class AudioFocusManager(
                                 if (audioMixingMode == AudioMixingMode.DO_NOT_MIX) {
                                     pausePlayerIfUnmuted(player)
                                 } else {
-                                    appContext.mainQueue.launch {
-                                        val volume = player.getVolume() / 20
-                                        view.userVolume = volume
-                                        player.setVolume(volume)
-                                    }
+                                    val volume = player.getVolume() / 20
+                                    view.userVolume = volume
+                                    player.setVolume(volume)
                                 }
                             }
                         }
@@ -175,9 +168,7 @@ class AudioFocusManager(
                         weakView.get()?.let { view ->
                             view.mediaPlayer?.let { player ->
                                 if (player.getVolume() > MIN_PLAYER_VOLUME) {
-                                    appContext.mainQueue.launch {
-                                        player.setVolume(view.userVolume)
-                                    }
+                                    player.setVolume(view.userVolume)
                                 }
                             }
                         }
@@ -190,9 +181,7 @@ class AudioFocusManager(
     private fun pausePlayerIfUnmuted(player: MediaPlayer?) {
         player?.let { mediaPlayer ->
             if (mediaPlayer.getVolume() > MIN_PLAYER_VOLUME) {
-                appContext.mainQueue.launch {
-                    mediaPlayer.pause()
-                }
+                mediaPlayer.pause()
             }
         }
     }

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

@@ -14,7 +14,7 @@ fun LibVlcPlayerView.setMediaListener() {
 
                         val audios = player.getAudioTracks()
 
-                        audios.forEach { track ->
+                        audios?.forEach { track ->
                             val trackMap = Arguments.createMap()
                             trackMap.putInt("id", track.id)
                             trackMap.putString("name", track.name)
@@ -25,7 +25,7 @@ fun LibVlcPlayerView.setMediaListener() {
 
                         val videos = player.getVideoTracks()
 
-                        videos.forEach { track ->
+                        videos?.forEach { track ->
                             val trackMap = Arguments.createMap()
                             trackMap.putInt("id", track.id)
                             trackMap.putString("name", track.name)
@@ -36,7 +36,7 @@ fun LibVlcPlayerView.setMediaListener() {
 
                         val subtitles = player.getSpuTracks()
 
-                        subtitles.forEach { track ->
+                        subtitles?.forEach { track ->
                             val trackMap = Arguments.createMap()
                             trackMap.putInt("id", track.id)
                             trackMap.putString("name", track.name)

package/ios/MediaPlayerManager.swift

@@ -4,10 +4,10 @@ import Foundation
 import MobileVLCKit
 
 class MediaPlayerManager {
-    static var shared = MediaPlayerManager()
+    static let shared = MediaPlayerManager()
 
-    private static var managerQueue = DispatchQueue(label: "com.expo.libvlcplayer.manager.managerQueue")
-    private var views = NSHashTable<LibVlcPlayerView>.weakObjects()
+    private static let managerQueue = DispatchQueue(label: "com.expo.libvlcplayer.manager.managerQueue")
+    private let views = NSHashTable<LibVlcPlayerView>.weakObjects()
 
     func registerView(view: LibVlcPlayerView) {
         views.add(view)
@@ -15,9 +15,9 @@ class MediaPlayerManager {
     }
 
     func unregisterView(view: LibVlcPlayerView) {
-        view.destroyPlayer()
         views.remove(view)
         setAppropriateAudioSessionOrWarn()
+        view.destroyPlayer()
     }
 
     func onAppForegrounded() {
@@ -114,14 +114,10 @@ class MediaPlayerManager {
 
     private func findAudioMixingMode() -> AudioMixingMode? {
         let playingViews = views.allObjects.filter { view in
-            if let isPlaying = view.mediaPlayer?.isPlaying, isPlaying {
-                return true
-            }
-
-            return false
+            view.mediaPlayer?.isPlaying == true
         }
 
-        var audioMixingMode: AudioMixingMode = .mixWithOthers
+        var audioMixingMode: AudioMixingMode = .auto
 
         if playingViews.isEmpty {
             return nil

package/package.json

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