expo-libvlc-player 0.1.49 → 0.1.50

package/android/build.gradle

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

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

@@ -1,9 +1,10 @@
 package expo.modules.libvlcplayer
 
-import com.facebook.react.bridge.ReadableMap
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 import expo.modules.libvlcplayer.enums.AudioMixingMode
+import expo.modules.libvlcplayer.records.Slave
+import expo.modules.libvlcplayer.records.Tracks
 
 private const val BUFFERING_EVENT = "onBuffering"
 private const val PLAYING_EVENT = "onPlaying"
@@ -52,11 +53,11 @@ class LibVlcPlayerModule : Module() {
                     view.options = options ?: ArrayList<String>()
                 }
 
-                Prop("slaves") { view: LibVlcPlayerView, slaves: ArrayList<ReadableMap>? ->
+                Prop("slaves") { view: LibVlcPlayerView, slaves: ArrayList<Slave>? ->
                     view.slaves = slaves
                 }
 
-                Prop("tracks") { view: LibVlcPlayerView, tracks: ReadableMap? ->
+                Prop("tracks") { view: LibVlcPlayerView, tracks: Tracks? ->
                     view.tracks = tracks
                 }
 

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

@@ -2,12 +2,12 @@ package expo.modules.libvlcplayer
 
 import android.content.Context
 import android.net.Uri
-import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.WritableMap
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
 import expo.modules.libvlcplayer.enums.AudioMixingMode
+import expo.modules.libvlcplayer.records.Slave
+import expo.modules.libvlcplayer.records.Tracks
 import org.videolan.libvlc.LibVLC
 import org.videolan.libvlc.Media
 import org.videolan.libvlc.MediaPlayer
@@ -53,7 +53,7 @@ class LibVlcPlayerView(
     internal val onEndReached by EventDispatcher()
     internal val onEncounteredError by EventDispatcher()
     internal val onPositionChanged by EventDispatcher()
-    internal val onParsedChanged by EventDispatcher<WritableMap>()
+    internal val onParsedChanged by EventDispatcher()
     internal val onBackground by EventDispatcher()
 
     init {
@@ -146,17 +146,16 @@ class LibVlcPlayerView(
             }
         }
 
-    fun addPlayerSlave(slave: ReadableMap) {
-        val source = slave.getString("source") ?: ""
-        val type = slave.getString("type") ?: "item"
-        val selected = false
-
+    fun addPlayerSlave(slave: Slave) {
+        val type = slave.type
         val slaveType =
             if (type == "subtitle") {
                 IMedia.Slave.Type.Subtitle
             } else {
                 IMedia.Slave.Type.Audio
             }
+        val source = slave.source
+        val selected = false
 
         try {
             mediaPlayer?.addSlave(slaveType, Uri.parse(source), selected)
@@ -168,11 +167,11 @@ class LibVlcPlayerView(
 
     fun addPlayerSlaves() {
         // Add in this specific order, otherwise subtitle slaves will be missing
-        slaves?.filter { it.getString("type") == "subtitle" }?.forEach(::addPlayerSlave)
-        slaves?.filter { it.getString("type") == "audio" }?.forEach(::addPlayerSlave)
+        slaves?.filter { it.type == "subtitle" }?.forEach(::addPlayerSlave)
+        slaves?.filter { it.type == "audio" }?.forEach(::addPlayerSlave)
     }
 
-    var slaves: ArrayList<ReadableMap>? = null
+    var slaves: ArrayList<Slave>? = null
         set(value) {
             field = value
             addPlayerSlaves()
@@ -180,9 +179,9 @@ class LibVlcPlayerView(
 
     fun setPlayerTracks() {
         mediaPlayer?.let { player ->
-            val audioTrack = tracks?.takeIf { it.hasKey("audio") }?.getInt("audio") ?: player.getAudioTrack()
-            val videoTrack = tracks?.takeIf { it.hasKey("video") }?.getInt("video") ?: player.getVideoTrack()
-            val spuTrack = tracks?.takeIf { it.hasKey("subtitle") }?.getInt("subtitle") ?: player.getSpuTrack()
+            val audioTrack = tracks?.audio ?: player.getAudioTrack()
+            val videoTrack = tracks?.video ?: player.getVideoTrack()
+            val spuTrack = tracks?.subtitle ?: player.getSpuTrack()
 
             player.setAudioTrack(audioTrack)
             player.setVideoTrack(videoTrack)
@@ -190,7 +189,7 @@ class LibVlcPlayerView(
         }
     }
 
-    var tracks: ReadableMap? = null
+    var tracks: Tracks? = null
         set(value) {
             if (options.hasAudioTrackOption()) {
                 val error = mapOf("error" to "Audio track selected via options")

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

@@ -1,6 +1,6 @@
 package expo.modules.libvlcplayer
 
-import com.facebook.react.bridge.Arguments
+import expo.modules.libvlcplayer.records.Track
 import org.videolan.libvlc.interfaces.IMedia.Event
 import org.videolan.libvlc.interfaces.IMedia.EventListener
 
@@ -10,43 +10,37 @@ fun LibVlcPlayerView.setMediaListener() {
             EventListener { event ->
                 when (event.type) {
                     Event.ParsedChanged -> {
-                        val audioTracks = Arguments.createArray()
+                        val audioTracks = mutableListOf<Track>()
                         val audios = player.getAudioTracks()
 
                         audios?.forEach { track ->
-                            val trackMap = Arguments.createMap()
-                            trackMap.putInt("id", track.id)
-                            trackMap.putString("name", track.name)
-                            audioTracks.pushMap(trackMap)
+                            val trackObj = Track(id = track.id, name = track.name)
+                            audioTracks.add(trackObj)
                         }
 
-                        val videoTracks = Arguments.createArray()
+                        val videoTracks = mutableListOf<Track>()
                         val videos = player.getVideoTracks()
 
                         videos?.forEach { track ->
-                            val trackMap = Arguments.createMap()
-                            trackMap.putInt("id", track.id)
-                            trackMap.putString("name", track.name)
-                            videoTracks.pushMap(trackMap)
+                            val trackObj = Track(id = track.id, name = track.name)
+                            videoTracks.add(trackObj)
                         }
 
-                        val subtitleTracks = Arguments.createArray()
+                        val subtitleTracks = mutableListOf<Track>()
                         val subtitles = player.getSpuTracks()
 
                         subtitles?.forEach { track ->
-                            val trackMap = Arguments.createMap()
-                            trackMap.putInt("id", track.id)
-                            trackMap.putString("name", track.name)
-                            subtitleTracks.pushMap(trackMap)
+                            val trackObj = Track(id = track.id, name = track.name)
+                            subtitleTracks.add(trackObj)
                         }
 
                         val video = player.getCurrentVideoTrack()
                         val tracks =
-                            Arguments.createMap().apply {
-                                putArray("audio", audioTracks)
-                                putArray("video", videoTracks)
-                                putArray("subtitle", subtitleTracks)
-                            }
+                            mapOf(
+                                "audio" to audioTracks,
+                                "video" to videoTracks,
+                                "subtitle" to subtitleTracks,
+                            )
                         val ratio = player.getAspectRatio()
                         val pLength = player.getLength()
                         val length =
@@ -58,14 +52,14 @@ fun LibVlcPlayerView.setMediaListener() {
                         val seekable = player.isSeekable()
 
                         val videoInfo =
-                            Arguments.createMap().apply {
-                                putInt("width", video?.width ?: 0)
-                                putInt("height", video?.height ?: 0)
-                                putMap("tracks", tracks)
-                                putString("aspectRatio", ratio)
-                                putDouble("duration", length.toDouble())
-                                putBoolean("seekable", seekable)
-                            }
+                            mapOf(
+                                "width" to (video?.width ?: 0),
+                                "height" to (video?.height ?: 0),
+                                "tracks" to tracks,
+                                "aspectRatio" to ratio,
+                                "duration" to length.toDouble(),
+                                "seekable" to seekable,
+                            )
 
                         onParsedChanged(videoInfo)
 

package/android/src/main/java/expo/modules/libvlcplayer/records/Slave.kt

@@ -0,0 +1,11 @@
+package expo.modules.libvlcplayer.records
+
+import expo.modules.kotlin.records.Field
+import expo.modules.kotlin.records.Record
+import java.io.Serializable
+
+class Slave(
+    @Field var source: String,
+    @Field var type: String,
+) : Record,
+    Serializable

package/android/src/main/java/expo/modules/libvlcplayer/records/Track.kt

@@ -0,0 +1,11 @@
+package expo.modules.libvlcplayer.records
+
+import expo.modules.kotlin.records.Field
+import expo.modules.kotlin.records.Record
+import java.io.Serializable
+
+data class Track(
+    @Field val id: Int,
+    @Field val name: String,
+) : Record,
+    Serializable

package/android/src/main/java/expo/modules/libvlcplayer/records/Tracks.kt

@@ -0,0 +1,12 @@
+package expo.modules.libvlcplayer.records
+
+import expo.modules.kotlin.records.Field
+import expo.modules.kotlin.records.Record
+import java.io.Serializable
+
+class Tracks(
+    @Field var audio: Int,
+    @Field var video: Int,
+    @Field var subtitle: Int,
+) : Record,
+    Serializable

package/ios/LibVlcPlayerModule.swift

@@ -41,11 +41,11 @@ public class LibVlcPlayerModule: Module {
                 view.options = options ?? [String]()
             }
 
-            Prop("slaves") { (view: LibVlcPlayerView, slaves: [[String: Any]]?) in
+            Prop("slaves") { (view: LibVlcPlayerView, slaves: [Slave]?) in
                 view.slaves = slaves
             }
 
-            Prop("tracks") { (view: LibVlcPlayerView, tracks: [String: Any]?) in
+            Prop("tracks") { (view: LibVlcPlayerView, tracks: Tracks?) in
                 view.tracks = tracks
             }
 

package/ios/LibVlcPlayerView.swift

@@ -117,14 +117,13 @@ class LibVlcPlayerView: ExpoView {
         }
     }
 
-    func addPlayerSlave(_ slave: [String: Any]) {
-        let source = slave["source"] as? String ?? ""
-        let type = slave["type"] as? String ?? "item"
-        let selected = false
-
+    func addPlayerSlave(_ slave: Slave) {
+        let source = slave.source
+        let type = slave.type
         let slaveType = type == "subtitle" ?
             VLCMediaPlaybackSlaveType.subtitle :
             VLCMediaPlaybackSlaveType.audio
+        let selected = false
 
         guard let url = URL(string: source) else {
             let error = ["error": "Invalid slave, \(type) could not be added"]
@@ -137,11 +136,11 @@ class LibVlcPlayerView: ExpoView {
 
     func addPlayerSlaves() {
         // Add in this specific order, otherwise subtitle slaves will be missing
-        slaves?.filter { ($0["type"] as? String) == "subtitle" }.forEach { addPlayerSlave($0) }
-        slaves?.filter { ($0["type"] as? String) == "audio" }.forEach { addPlayerSlave($0) }
+        slaves?.filter { $0.type == "subtitle" }.forEach { addPlayerSlave($0) }
+        slaves?.filter { $0.type == "audio" }.forEach { addPlayerSlave($0) }
     }
 
-    var slaves: [[String: Any]]? {
+    var slaves: [Slave]? {
         didSet {
             addPlayerSlaves()
         }
@@ -159,7 +158,7 @@ class LibVlcPlayerView: ExpoView {
         player.currentVideoSubTitleIndex = Int32(videoSubTitleIndex)
     }
 
-    var tracks: [String: Any]? {
+    var tracks: Tracks? {
         didSet {
             if options.hasAudioTrackOption() {
                 let error = ["error": "Audio track selected via options"]

package/ios/MediaDelegate.swift

@@ -4,44 +4,38 @@ extension LibVlcPlayerView: VLCMediaDelegate {
     func mediaDidFinishParsing(_: VLCMedia) {
         guard let player = mediaPlayer else { return }
 
-        var audioTracks: [[String: Any]] = []
+        var audioTracks: [Track] = []
 
         if let audios = player.audioTrackNames as? [String] {
             if let audioIndexes = player.audioTrackIndexes as? [NSNumber] {
-                for (index, name) in audios.enumerated() {
+                for (index, trackName) in audios.enumerated() {
                     let trackId = audioIndexes[index].intValue
-                    audioTracks.append([
-                        "id": trackId,
-                        "name": name,
-                    ])
+                    let track = Track(id: trackId, name: trackName)
+                    audioTracks.append(track)
                 }
             }
         }
 
-        var videoTracks: [[String: Any]] = []
+        var videoTracks: [Track] = []
 
         if let videos = player.videoTrackNames as? [String] {
             if let videoIndexes = player.videoTrackIndexes as? [NSNumber] {
-                for (index, name) in videos.enumerated() {
+                for (index, trackName) in videos.enumerated() {
                     let trackId = videoIndexes[index].intValue
-                    videoTracks.append([
-                        "id": trackId,
-                        "name": name,
-                    ])
+                    let track = Track(id: trackId, name: trackName)
+                    videoTracks.append(track)
                 }
             }
         }
 
-        var subtitleTracks: [[String: Any]] = []
+        var subtitleTracks: [Track] = []
 
         if let subtitles = player.videoSubTitlesNames as? [String] {
             if let subtitleIndexes = player.videoSubTitlesIndexes as? [NSNumber] {
-                for (index, name) in subtitles.enumerated() {
+                for (index, trackName) in subtitles.enumerated() {
                     let trackId = subtitleIndexes[index].intValue
-                    subtitleTracks.append([
-                        "id": trackId,
-                        "name": name,
-                    ])
+                    let track = Track(id: trackId, name: trackName)
+                    subtitleTracks.append(track)
                 }
             }
         }

package/ios/Records/Slave.swift

@@ -0,0 +1,9 @@
+import ExpoModulesCore
+
+struct Slave: Record {
+    @Field
+    var source: String
+
+    @Field
+    var type: String
+}

package/ios/Records/Track.swift

@@ -0,0 +1,14 @@
+import ExpoModulesCore
+
+struct Track: Record {
+    @Field
+    var id: Int
+
+    @Field
+    var name: String
+
+    init(id: Int, name: String) {
+        self.id = id
+        self.name = name
+    }
+}

package/ios/Records/Tracks.swift

@@ -0,0 +1,12 @@
+import ExpoModulesCore
+
+struct Tracks: Record {
+    @Field
+    var audio: Int
+
+    @Field
+    var video: Int
+
+    @Field
+    var subtitle: Int
+}

package/package.json

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