react-native-nitro-player 1.2.0 → 1.2.2

package/android/src/main/java/com/margelo/nitro/nitroplayer/core/TrackPlayerQueueBuild.kt

@@ -30,8 +30,7 @@ internal fun TrackPlayerCore.rebuildQueueAndPlayFromIndex(index: Int) {
 
     currentTrackIndex = index
     exo.clearMediaItems()
-    exo.setMediaItems(mediaItems)
-    exo.seekToDefaultPosition(0)
+    exo.setMediaItems(mediaItems, true)
     exo.prepare()
 }
 
@@ -123,7 +122,7 @@ internal fun TrackPlayerCore.updatePlayerQueue(tracks: List<TrackItem>) {
             val mediaId = if (playlistId.isNotEmpty()) "$playlistId:${track.id}" else track.id
             makeMediaItem(track, mediaId)
         }
-    exo.setMediaItems(mediaItems, false)
+    exo.setMediaItems(mediaItems, true)
     if (exo.playbackState == Player.STATE_IDLE && mediaItems.isNotEmpty()) {
         exo.prepare()
     }

package/android/src/main/java/com/margelo/nitro/nitroplayer/core/TrackPlayerTempQueue.kt

@@ -30,9 +30,13 @@ suspend fun TrackPlayerCore.loadPlaylist(
             }
 
         currentPlaylistId = playlistId
-        updatePlayerQueue(playlist.tracks)
-        if (targetIndex > 0) {
-            playFromIndexInternal(targetIndex)
+        if (targetIndex == 0) {
+            updatePlayerQueue(playlist.tracks)
+        } else {
+            // Bypass updatePlayerQueue to avoid emitting a spurious onTrackChange for index 0.
+            // Set currentTracks directly so rebuildQueueAndPlayFromIndex can use them.
+            currentTracks = playlist.tracks
+            rebuildQueueAndPlayFromIndex(targetIndex)
         }
         checkUpcomingTracksForUrls(lookaheadCount)
         notifyTemporaryQueueChange()

package/android/src/main/java/com/margelo/nitro/nitroplayer/media/MediaSessionCallbackFactory.kt

@@ -107,7 +107,7 @@ object MediaSessionCallbackFactory {
                 if (voiceMatch != null) {
                     val (playlistId, items, trackIndex) = voiceMatch
                     service.trackPlayerCore?.let { core ->
-                        scope.launch { core.loadPlaylist(playlistId) }
+                        scope.launch { core.loadPlaylist(playlistId, trackIndex) }
                     }
                     return Futures.immediateFuture(
                         MediaSession.MediaItemsWithStartPosition(items, trackIndex, startPositionMs),
@@ -130,7 +130,7 @@ object MediaSessionCallbackFactory {
                             val trackIndex = playlist.tracks.indexOfFirst { it.id == trackId }
                             if (trackIndex >= 0) {
                                 service.trackPlayerCore?.let { core ->
-                                    scope.launch { core.loadPlaylist(playlistId) }
+                                    scope.launch { core.loadPlaylist(playlistId, trackIndex) }
                                 }
                                 val playlistMediaItems =
                                     playlist.tracks

package/ios/core/TrackPlayerQueueBuild.swift

@@ -156,6 +156,12 @@ extension TrackPlayerCore {
       && !DownloadManagerCore.shared.isTrackDownloaded(trackId: targetTrack.id)
     if isLazyLoad {
       NitroPlayerLogger.log("TrackPlayerCore", "   ⏳ Lazy-load — deferring AVQueuePlayer setup; emitting track change for index \(index)")
+      // Clear old items immediately so the previous track stops while waiting for the URL to resolve
+      if let boundaryObserver = self.boundaryTimeObserver {
+        player?.removeTimeObserver(boundaryObserver)
+        self.boundaryTimeObserver = nil
+      }
+      player?.removeAllItems()
       self.currentTracks = fullPlaylist
       if let track = self.currentTracks[safe: index] {
         notifyTrackChange(track, .skip)

package/ios/core/TrackPlayerTempQueue.swift

@@ -44,8 +44,13 @@ extension TrackPlayerCore {
       }
 
       self.currentPlaylistId = playlistId
-      self.updatePlayerQueue(tracks: playlist.tracks)
-      if targetIndex > 0 {
+      if targetIndex == 0 {
+        self.updatePlayerQueue(tracks: playlist.tracks)
+      } else {
+        // Bypass updatePlayerQueue to avoid emitting a spurious onTrackChange for index 0.
+        // Set currentTracks directly so rebuildQueueFromPlaylistIndex can use them.
+        self.currentTracks = playlist.tracks
+        self.preloadedAssets.removeAll()
         _ = self.rebuildQueueFromPlaylistIndex(index: targetIndex)
       }
       self.emitStateChange()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-player",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "A powerful audio player library for React Native with playlist management, playback controls, and support for Android Auto and CarPlay",
   "main": "lib/index",
   "module": "lib/index",