react-native-nitro-player 0.6.0 → 0.7.0

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

@@ -1201,6 +1201,20 @@ class TrackPlayerCore private constructor(
         val currentIndex = player.currentMediaItemIndex
         if (currentIndex < 0) return
 
+        // Handle removed-current-track case: if the currently playing media item is no longer
+        // in currentTracks (e.g. the user removed it while it was playing), delegate to
+        // playFromIndexInternal so the player immediately starts the next track.
+        val currentTrackId = player.currentMediaItem?.mediaId?.let { extractTrackId(it) }
+        if (currentTrackId != null && currentTracks.none { it.id == currentTrackId }) {
+            val targetIndex = when {
+                currentTracks.isEmpty() -> return
+                currentTrackIndex < currentTracks.size -> currentTrackIndex
+                else -> currentTracks.size - 1
+            }
+            playFromIndexInternal(targetIndex)
+            return
+        }
+
         val newQueueTracks = ArrayList<TrackItem>(playNextStack.size + upNextQueue.size + currentTracks.size)
 
         // Add playNext stack (LIFO - most recently added plays first)
@@ -1609,6 +1623,35 @@ class TrackPlayerCore private constructor(
             if (currentPlaylistId != null && affectedPlaylists.containsKey(currentPlaylistId)) {
                 NitroPlayerLogger.log("TrackPlayerCore") { "🔄 Rebuilding queue - ${affectedPlaylists[currentPlaylistId]} tracks updated in current playlist" }
 
+                // PlaylistManager.updateTracks() creates a new Playlist via .copy(tracks = newTracks),
+                // so our currentTracks reference still points at the old list with empty URLs.
+                // Refresh it now so rebuildQueueFromCurrentPosition builds MediaItems with the
+                // resolved URLs, allowing ExoPlayer to pre-buffer the next track for gapless playback.
+                val refreshedPlaylist = playlistManager.getPlaylist(currentPlaylistId!!)
+                if (refreshedPlaylist != null) {
+                    currentTracks = refreshedPlaylist.tracks
+
+                    // Also reconcile any queued items that still reference old TrackItem instances
+                    // from this playlist, so that gapless pre-buffering uses tracks with resolved URLs.
+                    val updatedTrackById = currentTracks.associateBy { it.id }
+
+                    // Update playNextStack entries to point at the refreshed TrackItem objects.
+                    playNextStack.forEachIndexed { index, track ->
+                        val updated = updatedTrackById[track.id]
+                        if (updated != null && updated !== track) {
+                            playNextStack[index] = updated
+                        }
+                    }
+
+                    // Update upNextQueue entries to point at the refreshed TrackItem objects.
+                    upNextQueue.forEachIndexed { index, track ->
+                        val updated = updatedTrackById[track.id]
+                        if (updated != null && updated !== track) {
+                            upNextQueue[index] = updated
+                        }
+                    }
+                }
+
                 // This method preserves current item and gapless buffering
                 rebuildQueueFromCurrentPosition()
 

package/ios/core/TrackPlayerCore.swift

@@ -1931,6 +1931,21 @@ class TrackPlayerCore: NSObject {
     let currentItem = player.currentItem
     let playingItems = player.items()
 
+    // ---- Handle removed-current-track case ----
+    // If the currently playing AVPlayerItem is no longer in currentTracks (e.g. the user
+    // removed it while it was playing), delegate to rebuildQueueFromPlaylistIndex so the
+    // player immediately starts what is now at currentTrackIndex in the updated list.
+    if let playingTrackId = currentItem?.trackId,
+      !currentTracks.contains(where: { $0.id == playingTrackId }) {
+      let targetIndex = currentTrackIndex < currentTracks.count
+        ? currentTrackIndex
+        : currentTracks.count - 1
+      if targetIndex >= 0 {
+        _ = rebuildQueueFromPlaylistIndex(index: targetIndex)
+      }
+      return
+    }
+
     // ---- Build the desired upcoming track list ----
 
     var newQueueTracks: [TrackItem] = []

package/nitro.json

@@ -10,29 +10,62 @@
   },
   "autolinking": {
     "PlayerQueue": {
-      "swift": "HybridPlayerQueue",
-      "kotlin": "HybridPlayerQueue"
+      "ios": {
+        "language": "swift",
+        "implementationClassName": "HybridPlayerQueue"
+      },
+      "android": {
+        "language": "kotlin",
+        "implementationClassName": "HybridPlayerQueue"
+      }
     },
     "TrackPlayer": {
-      "swift": "HybridTrackPlayer",
-      "kotlin": "HybridTrackPlayer"
+      "ios": {
+        "language": "swift",
+        "implementationClassName": "HybridTrackPlayer"
+      },
+      "android": {
+        "language": "kotlin",
+        "implementationClassName": "HybridTrackPlayer"
+      }
     },
     "AndroidAutoMediaLibrary": {
-      "kotlin": "HybridAndroidAutoMediaLibrary"
+      "android": {
+        "language": "kotlin",
+        "implementationClassName": "HybridAndroidAutoMediaLibrary"
+      }
     },
     "AudioDevices": {
-      "kotlin": "HybridAudioDevices"
+      "android": {
+        "language": "kotlin",
+        "implementationClassName": "HybridAudioDevices"
+      }
     },
     "AudioRoutePicker": {
-      "swift": "HybridAudioRoutePicker"
+      "ios": {
+        "language": "swift",
+        "implementationClassName": "HybridAudioRoutePicker"
+      }
     },
     "DownloadManager": {
-      "swift": "HybridDownloadManager",
-      "kotlin": "HybridDownloadManager"
+      "ios": {
+        "language": "swift",
+        "implementationClassName": "HybridDownloadManager"
+      },
+      "android": {
+        "language": "kotlin",
+        "implementationClassName": "HybridDownloadManager"
+      }
     },
     "Equalizer": {
-      "swift": "HybridEqualizer",
-      "kotlin": "HybridEqualizer"
+      "ios": {
+        "language": "swift",
+        "implementationClassName": "HybridEqualizer"
+      },
+      "android": {
+        "language": "kotlin",
+        "implementationClassName": "HybridEqualizer"
+      }
     }
   },
   "ignorePaths": ["**/node_modules"]

package/nitrogen/generated/android/NitroPlayerOnLoad.cpp

@@ -44,25 +44,74 @@ int initialize(JavaVM* vm) {
   });
 }
 
+struct JHybridPlayerQueueSpecImpl: public jni::JavaClass<JHybridPlayerQueueSpecImpl, JHybridPlayerQueueSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/HybridPlayerQueue;";
+  static std::shared_ptr<JHybridPlayerQueueSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridPlayerQueueSpecImpl::javaobject()>();
+    jni::local_ref<JHybridPlayerQueueSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridPlayerQueueSpec();
+  }
+};
+struct JHybridTrackPlayerSpecImpl: public jni::JavaClass<JHybridTrackPlayerSpecImpl, JHybridTrackPlayerSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/HybridTrackPlayer;";
+  static std::shared_ptr<JHybridTrackPlayerSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridTrackPlayerSpecImpl::javaobject()>();
+    jni::local_ref<JHybridTrackPlayerSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridTrackPlayerSpec();
+  }
+};
+struct JHybridAndroidAutoMediaLibrarySpecImpl: public jni::JavaClass<JHybridAndroidAutoMediaLibrarySpecImpl, JHybridAndroidAutoMediaLibrarySpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/HybridAndroidAutoMediaLibrary;";
+  static std::shared_ptr<JHybridAndroidAutoMediaLibrarySpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridAndroidAutoMediaLibrarySpecImpl::javaobject()>();
+    jni::local_ref<JHybridAndroidAutoMediaLibrarySpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridAndroidAutoMediaLibrarySpec();
+  }
+};
+struct JHybridAudioDevicesSpecImpl: public jni::JavaClass<JHybridAudioDevicesSpecImpl, JHybridAudioDevicesSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/HybridAudioDevices;";
+  static std::shared_ptr<JHybridAudioDevicesSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridAudioDevicesSpecImpl::javaobject()>();
+    jni::local_ref<JHybridAudioDevicesSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridAudioDevicesSpec();
+  }
+};
+struct JHybridDownloadManagerSpecImpl: public jni::JavaClass<JHybridDownloadManagerSpecImpl, JHybridDownloadManagerSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/HybridDownloadManager;";
+  static std::shared_ptr<JHybridDownloadManagerSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridDownloadManagerSpecImpl::javaobject()>();
+    jni::local_ref<JHybridDownloadManagerSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridDownloadManagerSpec();
+  }
+};
+struct JHybridEqualizerSpecImpl: public jni::JavaClass<JHybridEqualizerSpecImpl, JHybridEqualizerSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/HybridEqualizer;";
+  static std::shared_ptr<JHybridEqualizerSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridEqualizerSpecImpl::javaobject()>();
+    jni::local_ref<JHybridEqualizerSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridEqualizerSpec();
+  }
+};
+
 void registerAllNatives() {
   using namespace margelo::nitro;
   using namespace margelo::nitro::nitroplayer;
 
   // Register native JNI methods
-  margelo::nitro::nitroplayer::JHybridAndroidAutoMediaLibrarySpec::registerNatives();
-  margelo::nitro::nitroplayer::JHybridAudioDevicesSpec::registerNatives();
-  margelo::nitro::nitroplayer::JHybridDownloadManagerSpec::registerNatives();
+  margelo::nitro::nitroplayer::JHybridAndroidAutoMediaLibrarySpec::CxxPart::registerNatives();
+  margelo::nitro::nitroplayer::JHybridAudioDevicesSpec::CxxPart::registerNatives();
+  margelo::nitro::nitroplayer::JHybridDownloadManagerSpec::CxxPart::registerNatives();
   margelo::nitro::nitroplayer::JFunc_void_DownloadProgress_cxx::registerNatives();
   margelo::nitro::nitroplayer::JFunc_void_std__string_std__string_DownloadState_std__optional_DownloadError__cxx::registerNatives();
   margelo::nitro::nitroplayer::JFunc_void_DownloadedTrack_cxx::registerNatives();
-  margelo::nitro::nitroplayer::JHybridEqualizerSpec::registerNatives();
+  margelo::nitro::nitroplayer::JHybridEqualizerSpec::CxxPart::registerNatives();
   margelo::nitro::nitroplayer::JFunc_void_bool_cxx::registerNatives();
   margelo::nitro::nitroplayer::JFunc_void_std__vector_EqualizerBand__cxx::registerNatives();
   margelo::nitro::nitroplayer::JFunc_void_std__optional_std__variant_nitro__NullType__std__string___cxx::registerNatives();
-  margelo::nitro::nitroplayer::JHybridPlayerQueueSpec::registerNatives();
+  margelo::nitro::nitroplayer::JHybridPlayerQueueSpec::CxxPart::registerNatives();
   margelo::nitro::nitroplayer::JFunc_void_std__vector_Playlist__std__optional_QueueOperation__cxx::registerNatives();
   margelo::nitro::nitroplayer::JFunc_void_std__string_Playlist_std__optional_QueueOperation__cxx::registerNatives();
-  margelo::nitro::nitroplayer::JHybridTrackPlayerSpec::registerNatives();
+  margelo::nitro::nitroplayer::JHybridTrackPlayerSpec::CxxPart::registerNatives();
   margelo::nitro::nitroplayer::JFunc_void_TrackItem_std__optional_Reason__cxx::registerNatives();
   margelo::nitro::nitroplayer::JFunc_void_TrackPlayerState_std__optional_Reason__cxx::registerNatives();
   margelo::nitro::nitroplayer::JFunc_void_double_double_cxx::registerNatives();
@@ -73,49 +122,37 @@ void registerAllNatives() {
   HybridObjectRegistry::registerHybridObjectConstructor(
     "PlayerQueue",
     []() -> std::shared_ptr<HybridObject> {
-      static DefaultConstructableObject<JHybridPlayerQueueSpec::javaobject> object("com/margelo/nitro/nitroplayer/HybridPlayerQueue");
-      auto instance = object.create();
-      return instance->cthis()->shared();
+      return JHybridPlayerQueueSpecImpl::create();
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "TrackPlayer",
     []() -> std::shared_ptr<HybridObject> {
-      static DefaultConstructableObject<JHybridTrackPlayerSpec::javaobject> object("com/margelo/nitro/nitroplayer/HybridTrackPlayer");
-      auto instance = object.create();
-      return instance->cthis()->shared();
+      return JHybridTrackPlayerSpecImpl::create();
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "AndroidAutoMediaLibrary",
     []() -> std::shared_ptr<HybridObject> {
-      static DefaultConstructableObject<JHybridAndroidAutoMediaLibrarySpec::javaobject> object("com/margelo/nitro/nitroplayer/HybridAndroidAutoMediaLibrary");
-      auto instance = object.create();
-      return instance->cthis()->shared();
+      return JHybridAndroidAutoMediaLibrarySpecImpl::create();
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "AudioDevices",
     []() -> std::shared_ptr<HybridObject> {
-      static DefaultConstructableObject<JHybridAudioDevicesSpec::javaobject> object("com/margelo/nitro/nitroplayer/HybridAudioDevices");
-      auto instance = object.create();
-      return instance->cthis()->shared();
+      return JHybridAudioDevicesSpecImpl::create();
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "DownloadManager",
     []() -> std::shared_ptr<HybridObject> {
-      static DefaultConstructableObject<JHybridDownloadManagerSpec::javaobject> object("com/margelo/nitro/nitroplayer/HybridDownloadManager");
-      auto instance = object.create();
-      return instance->cthis()->shared();
+      return JHybridDownloadManagerSpecImpl::create();
     }
   );
   HybridObjectRegistry::registerHybridObjectConstructor(
     "Equalizer",
     []() -> std::shared_ptr<HybridObject> {
-      static DefaultConstructableObject<JHybridEqualizerSpec::javaobject> object("com/margelo/nitro/nitroplayer/HybridEqualizer");
-      auto instance = object.create();
-      return instance->cthis()->shared();
+      return JHybridEqualizerSpecImpl::create();
     }
   );
 }

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

@@ -19,7 +19,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JCurrentPlayingType final: public jni::JavaClass<JCurrentPlayingType> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/CurrentPlayingType;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/CurrentPlayingType;";
 
   public:
     /**

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

@@ -28,7 +28,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JDownloadConfig final: public jni::JavaClass<JDownloadConfig> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadConfig;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadConfig;";
 
   public:
     /**

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

@@ -23,7 +23,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JDownloadError final: public jni::JavaClass<JDownloadError> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadError;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadError;";
 
   public:
     /**

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

@@ -19,7 +19,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JDownloadErrorReason final: public jni::JavaClass<JDownloadErrorReason> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadErrorReason;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadErrorReason;";
 
   public:
     /**

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

@@ -23,7 +23,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JDownloadProgress final: public jni::JavaClass<JDownloadProgress> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadProgress;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadProgress;";
 
   public:
     /**

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

@@ -21,7 +21,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JDownloadQueueStatus final: public jni::JavaClass<JDownloadQueueStatus> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadQueueStatus;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadQueueStatus;";
 
   public:
     /**

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

@@ -19,7 +19,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JDownloadState final: public jni::JavaClass<JDownloadState> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadState;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadState;";
 
   public:
     /**

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

@@ -21,7 +21,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JDownloadStorageInfo final: public jni::JavaClass<JDownloadStorageInfo> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadStorageInfo;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadStorageInfo;";
 
   public:
     /**

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

@@ -36,7 +36,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JDownloadTask final: public jni::JavaClass<JDownloadTask> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadTask;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadTask;";
 
   public:
     /**

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

@@ -37,7 +37,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JDownloadedPlaylist final: public jni::JavaClass<JDownloadedPlaylist> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadedPlaylist;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadedPlaylist;";
 
   public:
     /**

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

@@ -32,7 +32,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JDownloadedTrack final: public jni::JavaClass<JDownloadedTrack> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadedTrack;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/DownloadedTrack;";
 
   public:
     /**

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

@@ -21,7 +21,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JEqualizerBand final: public jni::JavaClass<JEqualizerBand> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/EqualizerBand;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/EqualizerBand;";
 
   public:
     /**

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

@@ -24,7 +24,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JEqualizerPreset final: public jni::JavaClass<JEqualizerPreset> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/EqualizerPreset;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/EqualizerPreset;";
 
   public:
     /**

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

@@ -29,7 +29,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JEqualizerState final: public jni::JavaClass<JEqualizerState> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/EqualizerState;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/EqualizerState;";
 
   public:
     /**

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

@@ -28,7 +28,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JFunc_void_DownloadProgress: public jni::JavaClass<JFunc_void_DownloadProgress> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_DownloadProgress;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_DownloadProgress;";
 
   public:
     /**
@@ -64,7 +64,7 @@ namespace margelo::nitro::nitroplayer {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_DownloadProgress_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_DownloadProgress_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_DownloadProgress_cxx::invoke_cxx)});
     }

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

@@ -37,7 +37,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JFunc_void_DownloadedTrack: public jni::JavaClass<JFunc_void_DownloadedTrack> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_DownloadedTrack;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_DownloadedTrack;";
 
   public:
     /**
@@ -73,7 +73,7 @@ namespace margelo::nitro::nitroplayer {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_DownloadedTrack_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_DownloadedTrack_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_DownloadedTrack_cxx::invoke_cxx)});
     }

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

@@ -35,7 +35,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JFunc_void_TrackItem_std__optional_Reason_: public jni::JavaClass<JFunc_void_TrackItem_std__optional_Reason_> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_TrackItem_std__optional_Reason_;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_TrackItem_std__optional_Reason_;";
 
   public:
     /**
@@ -71,7 +71,7 @@ namespace margelo::nitro::nitroplayer {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_TrackItem_std__optional_Reason__cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_TrackItem_std__optional_Reason__cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_TrackItem_std__optional_Reason__cxx::invoke_cxx)});
     }

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

@@ -28,7 +28,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JFunc_void_TrackPlayerState_std__optional_Reason_: public jni::JavaClass<JFunc_void_TrackPlayerState_std__optional_Reason_> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_TrackPlayerState_std__optional_Reason_;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_TrackPlayerState_std__optional_Reason_;";
 
   public:
     /**
@@ -64,7 +64,7 @@ namespace margelo::nitro::nitroplayer {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_TrackPlayerState_std__optional_Reason__cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_TrackPlayerState_std__optional_Reason__cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_TrackPlayerState_std__optional_Reason__cxx::invoke_cxx)});
     }

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

@@ -23,7 +23,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JFunc_void_bool: public jni::JavaClass<JFunc_void_bool> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_bool;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_bool;";
 
   public:
     /**
@@ -59,7 +59,7 @@ namespace margelo::nitro::nitroplayer {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_bool_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_bool_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_bool_cxx::invoke_cxx)});
     }

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

@@ -23,7 +23,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JFunc_void_double_double: public jni::JavaClass<JFunc_void_double_double> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_double_double;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_double_double;";
 
   public:
     /**
@@ -59,7 +59,7 @@ namespace margelo::nitro::nitroplayer {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_double_double_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_double_double_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_double_double_cxx::invoke_cxx)});
     }

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

@@ -24,7 +24,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JFunc_void_double_double_std__optional_bool_: public jni::JavaClass<JFunc_void_double_double_std__optional_bool_> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_double_double_std__optional_bool_;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_double_double_std__optional_bool_;";
 
   public:
     /**
@@ -60,7 +60,7 @@ namespace margelo::nitro::nitroplayer {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_double_double_std__optional_bool__cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_double_double_std__optional_bool__cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_double_double_std__optional_bool__cxx::invoke_cxx)});
     }

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

@@ -29,7 +29,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JFunc_void_std__optional_std__variant_nitro__NullType__std__string__: public jni::JavaClass<JFunc_void_std__optional_std__variant_nitro__NullType__std__string__> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_std__optional_std__variant_nitro__NullType__std__string__;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_std__optional_std__variant_nitro__NullType__std__string__;";
 
   public:
     /**
@@ -65,7 +65,7 @@ namespace margelo::nitro::nitroplayer {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_std__optional_std__variant_nitro__NullType__std__string___cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_std__optional_std__variant_nitro__NullType__std__string___cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_std__optional_std__variant_nitro__NullType__std__string___cxx::invoke_cxx)});
     }

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

@@ -38,7 +38,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JFunc_void_std__string_Playlist_std__optional_QueueOperation_: public jni::JavaClass<JFunc_void_std__string_Playlist_std__optional_QueueOperation_> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_std__string_Playlist_std__optional_QueueOperation_;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_std__string_Playlist_std__optional_QueueOperation_;";
 
   public:
     /**
@@ -74,7 +74,7 @@ namespace margelo::nitro::nitroplayer {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_std__string_Playlist_std__optional_QueueOperation__cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_std__string_Playlist_std__optional_QueueOperation__cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_std__string_Playlist_std__optional_QueueOperation__cxx::invoke_cxx)});
     }

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

@@ -31,7 +31,7 @@ namespace margelo::nitro::nitroplayer {
    */
   struct JFunc_void_std__string_std__string_DownloadState_std__optional_DownloadError_: public jni::JavaClass<JFunc_void_std__string_std__string_DownloadState_std__optional_DownloadError_> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_std__string_std__string_DownloadState_std__optional_DownloadError_;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_std__string_std__string_DownloadState_std__optional_DownloadError_;";
 
   public:
     /**
@@ -67,7 +67,7 @@ namespace margelo::nitro::nitroplayer {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_std__string_std__string_DownloadState_std__optional_DownloadError__cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/Func_void_std__string_std__string_DownloadState_std__optional_DownloadError__cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_std__string_std__string_DownloadState_std__optional_DownloadError__cxx::invoke_cxx)});
     }