react-native-nitro-player 1.0.3 → 1.1.0

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

@@ -167,7 +167,7 @@ internal fun TrackPlayerCore.emitStateChange(reason: Reason? = null) {
     val state =
         when (exo.playbackState) {
             Player.STATE_IDLE -> TrackPlayerState.STOPPED
-            Player.STATE_BUFFERING -> if (exo.playWhenReady) TrackPlayerState.PLAYING else TrackPlayerState.PAUSED
+            Player.STATE_BUFFERING -> if (exo.playWhenReady) TrackPlayerState.BUFFERING else TrackPlayerState.PAUSED
             Player.STATE_READY -> if (exo.isPlaying) TrackPlayerState.PLAYING else TrackPlayerState.PAUSED
             Player.STATE_ENDED -> TrackPlayerState.STOPPED
             else -> TrackPlayerState.STOPPED

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

@@ -38,7 +38,7 @@ internal fun TrackPlayerCore.getStateInternal(): PlayerState {
     val state =
         when (exo.playbackState) {
             Player.STATE_IDLE -> TrackPlayerState.STOPPED
-            Player.STATE_BUFFERING -> if (exo.playWhenReady) TrackPlayerState.PLAYING else TrackPlayerState.PAUSED
+            Player.STATE_BUFFERING -> if (exo.playWhenReady) TrackPlayerState.BUFFERING else TrackPlayerState.PAUSED
             Player.STATE_READY -> if (exo.isPlaying) TrackPlayerState.PLAYING else TrackPlayerState.PAUSED
             Player.STATE_ENDED -> TrackPlayerState.STOPPED
             else -> TrackPlayerState.STOPPED

package/ios/core/TrackPlayerListener.swift

@@ -372,16 +372,18 @@ extension TrackPlayerCore {
     }
     currentItemObservers.append(statusObserver)
 
-    let bufferEmptyObserver = item.observe(\.isPlaybackBufferEmpty, options: [.new]) { item, _ in
+    let bufferEmptyObserver = item.observe(\.isPlaybackBufferEmpty, options: [.new]) { [weak self] item, _ in
       if item.isPlaybackBufferEmpty {
         NitroPlayerLogger.log("TrackPlayerCore", "⏸️ Buffer empty (buffering)")
+        self?.emitStateChange()
       }
     }
     currentItemObservers.append(bufferEmptyObserver)
 
-    let bufferKeepUpObserver = item.observe(\.isPlaybackLikelyToKeepUp, options: [.new]) { item, _ in
+    let bufferKeepUpObserver = item.observe(\.isPlaybackLikelyToKeepUp, options: [.new]) { [weak self] item, _ in
       if item.isPlaybackLikelyToKeepUp {
         NitroPlayerLogger.log("TrackPlayerCore", "▶️ Buffer likely to keep up")
+        self?.emitStateChange()
       }
     }
     currentItemObservers.append(bufferKeepUpObserver)
@@ -390,10 +392,15 @@ extension TrackPlayerCore {
   func emitStateChange(reason: Reason? = nil) {
     guard let player else { return }
     let state: TrackPlayerState
-    if player.rate == 0 { state = .paused }
-    else if player.timeControlStatus == .playing { state = .playing }
-    else if player.timeControlStatus == .waitingToPlayAtSpecifiedRate { state = .paused }
-    else { state = .stopped }
+    if player.timeControlStatus == .playing {
+      state = .playing
+    } else if player.timeControlStatus == .waitingToPlayAtSpecifiedRate {
+      state = .buffering
+    } else if player.rate == 0 {
+      state = .paused
+    } else {
+      state = .stopped
+    }
     NitroPlayerLogger.log("TrackPlayerCore", "🔔 Emitting state change: \(state)")
     notifyPlaybackStateChange(state, reason)
   }

package/ios/core/TrackPlayerQueue.swift

@@ -47,8 +47,9 @@ extension TrackPlayerCore {
     let totalDuration = (rawDuration > 0 && !rawDuration.isNaN && !rawDuration.isInfinite) ? rawDuration : 0.0
 
     let state: TrackPlayerState
-    if player.rate == 0 { state = .paused }
-    else if player.timeControlStatus == .playing { state = .playing }
+    if player.timeControlStatus == .playing { state = .playing }
+    else if player.timeControlStatus == .waitingToPlayAtSpecifiedRate { state = .buffering }
+    else if player.rate == 0 { state = .paused }
     else { state = .stopped }
 
     let currentIndex: Double = currentTrackIndex >= 0 ? Double(currentTrackIndex) : -1.0

package/lib/types/PlayerQueue.d.ts

@@ -18,7 +18,7 @@ export interface Playlist {
     tracks: TrackItem[];
 }
 export type QueueOperation = 'add' | 'remove' | 'clear' | 'update';
-export type TrackPlayerState = 'playing' | 'paused' | 'stopped';
+export type TrackPlayerState = 'playing' | 'paused' | 'stopped' | 'buffering';
 export type Reason = 'user_action' | 'skip' | 'end' | 'error' | 'repeat';
 export interface PlayerState {
     currentTrack: TrackItem | null;

package/nitrogen/generated/android/c++/JTrackPlayerState.hpp

@@ -51,6 +51,9 @@ namespace margelo::nitro::nitroplayer {
         case TrackPlayerState::STOPPED:
           static const auto fieldSTOPPED = clazz->getStaticField<JTrackPlayerState>("STOPPED");
           return clazz->getStaticFieldValue(fieldSTOPPED);
+        case TrackPlayerState::BUFFERING:
+          static const auto fieldBUFFERING = clazz->getStaticField<JTrackPlayerState>("BUFFERING");
+          return clazz->getStaticFieldValue(fieldBUFFERING);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));
           throw std::invalid_argument("Invalid enum value (" + stringValue + "!");

package/nitrogen/generated/android/kotlin/com/margelo/nitro/nitroplayer/TrackPlayerState.kt

@@ -18,7 +18,8 @@ import com.facebook.proguard.annotations.DoNotStrip
 enum class TrackPlayerState(@DoNotStrip @Keep val value: Int) {
   PAUSED(0),
   PLAYING(1),
-  STOPPED(2);
+  STOPPED(2),
+  BUFFERING(3);
 
   companion object
 }

package/nitrogen/generated/ios/swift/TrackPlayerState.swift

@@ -23,6 +23,8 @@ public extension TrackPlayerState {
         self = .playing
       case "stopped":
         self = .stopped
+      case "buffering":
+        self = .buffering
       default:
         return nil
     }
@@ -39,6 +41,8 @@ public extension TrackPlayerState {
         return "playing"
       case .stopped:
         return "stopped"
+      case .buffering:
+        return "buffering"
     }
   }
 }

package/nitrogen/generated/shared/c++/TrackPlayerState.hpp

@@ -32,6 +32,7 @@ namespace margelo::nitro::nitroplayer {
     PAUSED      SWIFT_NAME(paused) = 0,
     PLAYING      SWIFT_NAME(playing) = 1,
     STOPPED      SWIFT_NAME(stopped) = 2,
+    BUFFERING      SWIFT_NAME(buffering) = 3,
   } CLOSED_ENUM;
 
 } // namespace margelo::nitro::nitroplayer
@@ -47,6 +48,7 @@ namespace margelo::nitro {
         case hashString("paused"): return margelo::nitro::nitroplayer::TrackPlayerState::PAUSED;
         case hashString("playing"): return margelo::nitro::nitroplayer::TrackPlayerState::PLAYING;
         case hashString("stopped"): return margelo::nitro::nitroplayer::TrackPlayerState::STOPPED;
+        case hashString("buffering"): return margelo::nitro::nitroplayer::TrackPlayerState::BUFFERING;
         default: [[unlikely]]
           throw std::invalid_argument("Cannot convert \"" + unionValue + "\" to enum TrackPlayerState - invalid value!");
       }
@@ -56,6 +58,7 @@ namespace margelo::nitro {
         case margelo::nitro::nitroplayer::TrackPlayerState::PAUSED: return JSIConverter<std::string>::toJSI(runtime, "paused");
         case margelo::nitro::nitroplayer::TrackPlayerState::PLAYING: return JSIConverter<std::string>::toJSI(runtime, "playing");
         case margelo::nitro::nitroplayer::TrackPlayerState::STOPPED: return JSIConverter<std::string>::toJSI(runtime, "stopped");
+        case margelo::nitro::nitroplayer::TrackPlayerState::BUFFERING: return JSIConverter<std::string>::toJSI(runtime, "buffering");
         default: [[unlikely]]
           throw std::invalid_argument("Cannot convert TrackPlayerState to JS - invalid value: "
                                     + std::to_string(static_cast<int>(arg)) + "!");
@@ -70,6 +73,7 @@ namespace margelo::nitro {
         case hashString("paused"):
         case hashString("playing"):
         case hashString("stopped"):
+        case hashString("buffering"):
           return true;
         default:
           return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-player",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "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",

package/src/types/PlayerQueue.ts

@@ -26,7 +26,7 @@ export interface Playlist {
 
 export type QueueOperation = 'add' | 'remove' | 'clear' | 'update'
 
-export type TrackPlayerState = 'playing' | 'paused' | 'stopped'
+export type TrackPlayerState = 'playing' | 'paused' | 'stopped' | 'buffering'
 
 export type Reason = 'user_action' | 'skip' | 'end' | 'error' | 'repeat'