react-native-nitro-player 0.6.0 → 0.7.0

package/nitrogen/generated/android/c++/JHybridPlayerQueueSpec.cpp

@@ -37,37 +37,31 @@ namespace margelo::nitro::nitroplayer { enum class QueueOperation; }
 
 namespace margelo::nitro::nitroplayer {
 
-  jni::local_ref<JHybridPlayerQueueSpec::jhybriddata> JHybridPlayerQueueSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridPlayerQueueSpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridPlayerQueueSpec::initHybrid),
-    });
+  std::shared_ptr<JHybridPlayerQueueSpec> JHybridPlayerQueueSpec::JavaPart::getJHybridPlayerQueueSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridPlayerQueueSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridPlayerQueueSpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridPlayerQueueSpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridPlayerQueueSpec::CxxPart::jhybriddata> JHybridPlayerQueueSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  bool JHybridPlayerQueueSpec::equals(const std::shared_ptr<HybridObject>& other) {
-    if (auto otherCast = std::dynamic_pointer_cast<JHybridPlayerQueueSpec>(other)) {
-      return _javaPart == otherCast->_javaPart;
+  std::shared_ptr<JHybridObject> JHybridPlayerQueueSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridPlayerQueueSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridPlayerQueueSpec::JavaPart!");
     }
-    return false;
-  }
-
-  void JHybridPlayerQueueSpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+    return std::make_shared<JHybridPlayerQueueSpec>(castJavaPart);
   }
 
-  std::string JHybridPlayerQueueSpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridPlayerQueueSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridPlayerQueueSpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
@@ -75,25 +69,25 @@ namespace margelo::nitro::nitroplayer {
 
   // Methods
   std::string JHybridPlayerQueueSpec::createPlaylist(const std::string& name, const std::optional<std::string>& description, const std::optional<std::string>& artwork) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JString>(jni::alias_ref<jni::JString> /* name */, jni::alias_ref<jni::JString> /* description */, jni::alias_ref<jni::JString> /* artwork */)>("createPlaylist");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JString>(jni::alias_ref<jni::JString> /* name */, jni::alias_ref<jni::JString> /* description */, jni::alias_ref<jni::JString> /* artwork */)>("createPlaylist");
     auto __result = method(_javaPart, jni::make_jstring(name), description.has_value() ? jni::make_jstring(description.value()) : nullptr, artwork.has_value() ? jni::make_jstring(artwork.value()) : nullptr);
     return __result->toStdString();
   }
   void JHybridPlayerQueueSpec::deletePlaylist(const std::string& playlistId) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* playlistId */)>("deletePlaylist");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* playlistId */)>("deletePlaylist");
     method(_javaPart, jni::make_jstring(playlistId));
   }
   void JHybridPlayerQueueSpec::updatePlaylist(const std::string& playlistId, const std::optional<std::string>& name, const std::optional<std::string>& description, const std::optional<std::string>& artwork) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* playlistId */, jni::alias_ref<jni::JString> /* name */, jni::alias_ref<jni::JString> /* description */, jni::alias_ref<jni::JString> /* artwork */)>("updatePlaylist");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* playlistId */, jni::alias_ref<jni::JString> /* name */, jni::alias_ref<jni::JString> /* description */, jni::alias_ref<jni::JString> /* artwork */)>("updatePlaylist");
     method(_javaPart, jni::make_jstring(playlistId), name.has_value() ? jni::make_jstring(name.value()) : nullptr, description.has_value() ? jni::make_jstring(description.value()) : nullptr, artwork.has_value() ? jni::make_jstring(artwork.value()) : nullptr);
   }
   std::variant<nitro::NullType, Playlist> JHybridPlayerQueueSpec::getPlaylist(const std::string& playlistId) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JVariant_NullType_Playlist>(jni::alias_ref<jni::JString> /* playlistId */)>("getPlaylist");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JVariant_NullType_Playlist>(jni::alias_ref<jni::JString> /* playlistId */)>("getPlaylist");
     auto __result = method(_javaPart, jni::make_jstring(playlistId));
     return __result->toCpp();
   }
   std::vector<Playlist> JHybridPlayerQueueSpec::getAllPlaylists() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JArrayClass<JPlaylist>>()>("getAllPlaylists");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JArrayClass<JPlaylist>>()>("getAllPlaylists");
     auto __result = method(_javaPart);
     return [&]() {
       size_t __size = __result->size();
@@ -107,11 +101,11 @@ namespace margelo::nitro::nitroplayer {
     }();
   }
   void JHybridPlayerQueueSpec::addTrackToPlaylist(const std::string& playlistId, const TrackItem& track, std::optional<double> index) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* playlistId */, jni::alias_ref<JTrackItem> /* track */, jni::alias_ref<jni::JDouble> /* index */)>("addTrackToPlaylist");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* playlistId */, jni::alias_ref<JTrackItem> /* track */, jni::alias_ref<jni::JDouble> /* index */)>("addTrackToPlaylist");
     method(_javaPart, jni::make_jstring(playlistId), JTrackItem::fromCpp(track), index.has_value() ? jni::JDouble::valueOf(index.value()) : nullptr);
   }
   void JHybridPlayerQueueSpec::addTracksToPlaylist(const std::string& playlistId, const std::vector<TrackItem>& tracks, std::optional<double> index) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* playlistId */, jni::alias_ref<jni::JArrayClass<JTrackItem>> /* tracks */, jni::alias_ref<jni::JDouble> /* index */)>("addTracksToPlaylist");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* playlistId */, jni::alias_ref<jni::JArrayClass<JTrackItem>> /* tracks */, jni::alias_ref<jni::JDouble> /* index */)>("addTracksToPlaylist");
     method(_javaPart, jni::make_jstring(playlistId), [&]() {
       size_t __size = tracks.size();
       jni::local_ref<jni::JArrayClass<JTrackItem>> __array = jni::JArrayClass<JTrackItem>::newArray(__size);
@@ -124,28 +118,28 @@ namespace margelo::nitro::nitroplayer {
     }(), index.has_value() ? jni::JDouble::valueOf(index.value()) : nullptr);
   }
   void JHybridPlayerQueueSpec::removeTrackFromPlaylist(const std::string& playlistId, const std::string& trackId) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* playlistId */, jni::alias_ref<jni::JString> /* trackId */)>("removeTrackFromPlaylist");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* playlistId */, jni::alias_ref<jni::JString> /* trackId */)>("removeTrackFromPlaylist");
     method(_javaPart, jni::make_jstring(playlistId), jni::make_jstring(trackId));
   }
   void JHybridPlayerQueueSpec::reorderTrackInPlaylist(const std::string& playlistId, const std::string& trackId, double newIndex) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* playlistId */, jni::alias_ref<jni::JString> /* trackId */, double /* newIndex */)>("reorderTrackInPlaylist");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* playlistId */, jni::alias_ref<jni::JString> /* trackId */, double /* newIndex */)>("reorderTrackInPlaylist");
     method(_javaPart, jni::make_jstring(playlistId), jni::make_jstring(trackId), newIndex);
   }
   void JHybridPlayerQueueSpec::loadPlaylist(const std::string& playlistId) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* playlistId */)>("loadPlaylist");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* playlistId */)>("loadPlaylist");
     method(_javaPart, jni::make_jstring(playlistId));
   }
   std::variant<nitro::NullType, std::string> JHybridPlayerQueueSpec::getCurrentPlaylistId() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JVariant_NullType_String>()>("getCurrentPlaylistId");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JVariant_NullType_String>()>("getCurrentPlaylistId");
     auto __result = method(_javaPart);
     return __result->toCpp();
   }
   void JHybridPlayerQueueSpec::onPlaylistsChanged(const std::function<void(const std::vector<Playlist>& /* playlists */, std::optional<QueueOperation> /* operation */)>& callback) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__vector_Playlist__std__optional_QueueOperation_::javaobject> /* callback */)>("onPlaylistsChanged_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__vector_Playlist__std__optional_QueueOperation_::javaobject> /* callback */)>("onPlaylistsChanged_cxx");
     method(_javaPart, JFunc_void_std__vector_Playlist__std__optional_QueueOperation__cxx::fromCpp(callback));
   }
   void JHybridPlayerQueueSpec::onPlaylistChanged(const std::function<void(const std::string& /* playlistId */, const Playlist& /* playlist */, std::optional<QueueOperation> /* operation */)>& callback) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string_Playlist_std__optional_QueueOperation_::javaobject> /* callback */)>("onPlaylistChanged_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string_Playlist_std__optional_QueueOperation_::javaobject> /* callback */)>("onPlaylistChanged_cxx");
     method(_javaPart, JFunc_void_std__string_Playlist_std__optional_QueueOperation__cxx::fromCpp(callback));
   }
 

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

@@ -18,34 +18,33 @@ namespace margelo::nitro::nitroplayer {
 
   using namespace facebook;
 
-  class JHybridPlayerQueueSpec: public jni::HybridClass<JHybridPlayerQueueSpec, JHybridObject>,
-                                public virtual HybridPlayerQueueSpec {
+  class JHybridPlayerQueueSpec: public virtual HybridPlayerQueueSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/HybridPlayerQueueSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridPlayerQueueSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridPlayerQueueSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/HybridPlayerQueueSpec;";
+      std::shared_ptr<JHybridPlayerQueueSpec> getJHybridPlayerQueueSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/HybridPlayerQueueSpec$CxxPart;";
+      static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
+      static void registerNatives();
+      using HybridBase::HybridBase;
+    protected:
+      std::shared_ptr<JHybridObject> createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) override;
+    };
 
   public:
+    explicit JHybridPlayerQueueSpec(const jni::local_ref<JHybridPlayerQueueSpec::JavaPart>& javaPart):
+      HybridObject(HybridPlayerQueueSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridPlayerQueueSpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }
 
   public:
-    size_t getExternalMemorySize() noexcept override;
-    bool equals(const std::shared_ptr<HybridObject>& other) override;
-    void dispose() noexcept override;
-    std::string toString() override;
-
-  public:
-    inline const jni::global_ref<JHybridPlayerQueueSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridPlayerQueueSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -70,9 +69,7 @@ namespace margelo::nitro::nitroplayer {
     void onPlaylistChanged(const std::function<void(const std::string& /* playlistId */, const Playlist& /* playlist */, std::optional<QueueOperation> /* operation */)>& callback) override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridPlayerQueueSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridPlayerQueueSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::nitroplayer

package/nitrogen/generated/android/c++/JHybridTrackPlayerSpec.cpp

@@ -60,37 +60,31 @@ namespace margelo::nitro::nitroplayer { enum class Reason; }
 
 namespace margelo::nitro::nitroplayer {
 
-  jni::local_ref<JHybridTrackPlayerSpec::jhybriddata> JHybridTrackPlayerSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridTrackPlayerSpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridTrackPlayerSpec::initHybrid),
-    });
+  std::shared_ptr<JHybridTrackPlayerSpec> JHybridTrackPlayerSpec::JavaPart::getJHybridTrackPlayerSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridTrackPlayerSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridTrackPlayerSpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridTrackPlayerSpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridTrackPlayerSpec::CxxPart::jhybriddata> JHybridTrackPlayerSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  bool JHybridTrackPlayerSpec::equals(const std::shared_ptr<HybridObject>& other) {
-    if (auto otherCast = std::dynamic_pointer_cast<JHybridTrackPlayerSpec>(other)) {
-      return _javaPart == otherCast->_javaPart;
+  std::shared_ptr<JHybridObject> JHybridTrackPlayerSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridTrackPlayerSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridTrackPlayerSpec::JavaPart!");
     }
-    return false;
-  }
-
-  void JHybridTrackPlayerSpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+    return std::make_shared<JHybridTrackPlayerSpec>(castJavaPart);
   }
 
-  std::string JHybridTrackPlayerSpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridTrackPlayerSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridTrackPlayerSpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
@@ -98,15 +92,15 @@ namespace margelo::nitro::nitroplayer {
 
   // Methods
   void JHybridTrackPlayerSpec::play() {
-    static const auto method = javaClassStatic()->getMethod<void()>("play");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("play");
     method(_javaPart);
   }
   void JHybridTrackPlayerSpec::pause() {
-    static const auto method = javaClassStatic()->getMethod<void()>("pause");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("pause");
     method(_javaPart);
   }
   std::shared_ptr<Promise<void>> JHybridTrackPlayerSpec::playSong(const std::string& songId, const std::optional<std::string>& fromPlaylist) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* songId */, jni::alias_ref<jni::JString> /* fromPlaylist */)>("playSong");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* songId */, jni::alias_ref<jni::JString> /* fromPlaylist */)>("playSong");
     auto __result = method(_javaPart, jni::make_jstring(songId), fromPlaylist.has_value() ? jni::make_jstring(fromPlaylist.value()) : nullptr);
     return [&]() {
       auto __promise = Promise<void>::create();
@@ -121,11 +115,11 @@ namespace margelo::nitro::nitroplayer {
     }();
   }
   void JHybridTrackPlayerSpec::skipToNext() {
-    static const auto method = javaClassStatic()->getMethod<void()>("skipToNext");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("skipToNext");
     method(_javaPart);
   }
   std::shared_ptr<Promise<bool>> JHybridTrackPlayerSpec::skipToIndex(double index) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(double /* index */)>("skipToIndex");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(double /* index */)>("skipToIndex");
     auto __result = method(_javaPart, index);
     return [&]() {
       auto __promise = Promise<bool>::create();
@@ -141,15 +135,15 @@ namespace margelo::nitro::nitroplayer {
     }();
   }
   void JHybridTrackPlayerSpec::skipToPrevious() {
-    static const auto method = javaClassStatic()->getMethod<void()>("skipToPrevious");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("skipToPrevious");
     method(_javaPart);
   }
   void JHybridTrackPlayerSpec::seek(double position) {
-    static const auto method = javaClassStatic()->getMethod<void(double /* position */)>("seek");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(double /* position */)>("seek");
     method(_javaPart, position);
   }
   std::shared_ptr<Promise<void>> JHybridTrackPlayerSpec::addToUpNext(const std::string& trackId) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* trackId */)>("addToUpNext");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* trackId */)>("addToUpNext");
     auto __result = method(_javaPart, jni::make_jstring(trackId));
     return [&]() {
       auto __promise = Promise<void>::create();
@@ -164,7 +158,7 @@ namespace margelo::nitro::nitroplayer {
     }();
   }
   std::shared_ptr<Promise<void>> JHybridTrackPlayerSpec::playNext(const std::string& trackId) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* trackId */)>("playNext");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* trackId */)>("playNext");
     auto __result = method(_javaPart, jni::make_jstring(trackId));
     return [&]() {
       auto __promise = Promise<void>::create();
@@ -179,7 +173,7 @@ namespace margelo::nitro::nitroplayer {
     }();
   }
   std::shared_ptr<Promise<std::vector<TrackItem>>> JHybridTrackPlayerSpec::getActualQueue() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getActualQueue");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getActualQueue");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<std::vector<TrackItem>>::create();
@@ -204,7 +198,7 @@ namespace margelo::nitro::nitroplayer {
     }();
   }
   std::shared_ptr<Promise<PlayerState>> JHybridTrackPlayerSpec::getState() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getState");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getState");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<PlayerState>::create();
@@ -220,51 +214,51 @@ namespace margelo::nitro::nitroplayer {
     }();
   }
   bool JHybridTrackPlayerSpec::setRepeatMode(RepeatMode mode) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<JRepeatMode> /* mode */)>("setRepeatMode");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<JRepeatMode> /* mode */)>("setRepeatMode");
     auto __result = method(_javaPart, JRepeatMode::fromCpp(mode));
     return static_cast<bool>(__result);
   }
   RepeatMode JHybridTrackPlayerSpec::getRepeatMode() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JRepeatMode>()>("getRepeatMode");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JRepeatMode>()>("getRepeatMode");
     auto __result = method(_javaPart);
     return __result->toCpp();
   }
   void JHybridTrackPlayerSpec::configure(const PlayerConfig& config) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JPlayerConfig> /* config */)>("configure");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JPlayerConfig> /* config */)>("configure");
     method(_javaPart, JPlayerConfig::fromCpp(config));
   }
   void JHybridTrackPlayerSpec::onChangeTrack(const std::function<void(const TrackItem& /* track */, std::optional<Reason> /* reason */)>& callback) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_TrackItem_std__optional_Reason_::javaobject> /* callback */)>("onChangeTrack_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_TrackItem_std__optional_Reason_::javaobject> /* callback */)>("onChangeTrack_cxx");
     method(_javaPart, JFunc_void_TrackItem_std__optional_Reason__cxx::fromCpp(callback));
   }
   void JHybridTrackPlayerSpec::onPlaybackStateChange(const std::function<void(TrackPlayerState /* state */, std::optional<Reason> /* reason */)>& callback) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_TrackPlayerState_std__optional_Reason_::javaobject> /* callback */)>("onPlaybackStateChange_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_TrackPlayerState_std__optional_Reason_::javaobject> /* callback */)>("onPlaybackStateChange_cxx");
     method(_javaPart, JFunc_void_TrackPlayerState_std__optional_Reason__cxx::fromCpp(callback));
   }
   void JHybridTrackPlayerSpec::onSeek(const std::function<void(double /* position */, double /* totalDuration */)>& callback) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_double_double::javaobject> /* callback */)>("onSeek_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_double_double::javaobject> /* callback */)>("onSeek_cxx");
     method(_javaPart, JFunc_void_double_double_cxx::fromCpp(callback));
   }
   void JHybridTrackPlayerSpec::onPlaybackProgressChange(const std::function<void(double /* position */, double /* totalDuration */, std::optional<bool> /* isManuallySeeked */)>& callback) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_double_double_std__optional_bool_::javaobject> /* callback */)>("onPlaybackProgressChange_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_double_double_std__optional_bool_::javaobject> /* callback */)>("onPlaybackProgressChange_cxx");
     method(_javaPart, JFunc_void_double_double_std__optional_bool__cxx::fromCpp(callback));
   }
   void JHybridTrackPlayerSpec::onAndroidAutoConnectionChange(const std::function<void(bool /* connected */)>& callback) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_bool::javaobject> /* callback */)>("onAndroidAutoConnectionChange_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_bool::javaobject> /* callback */)>("onAndroidAutoConnectionChange_cxx");
     method(_javaPart, JFunc_void_bool_cxx::fromCpp(callback));
   }
   bool JHybridTrackPlayerSpec::isAndroidAutoConnected() {
-    static const auto method = javaClassStatic()->getMethod<jboolean()>("isAndroidAutoConnected");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean()>("isAndroidAutoConnected");
     auto __result = method(_javaPart);
     return static_cast<bool>(__result);
   }
   bool JHybridTrackPlayerSpec::setVolume(double volume) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(double /* volume */)>("setVolume");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(double /* volume */)>("setVolume");
     auto __result = method(_javaPart, volume);
     return static_cast<bool>(__result);
   }
   std::shared_ptr<Promise<void>> JHybridTrackPlayerSpec::updateTracks(const std::vector<TrackItem>& tracks) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JArrayClass<JTrackItem>> /* tracks */)>("updateTracks");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JArrayClass<JTrackItem>> /* tracks */)>("updateTracks");
     auto __result = method(_javaPart, [&]() {
       size_t __size = tracks.size();
       jni::local_ref<jni::JArrayClass<JTrackItem>> __array = jni::JArrayClass<JTrackItem>::newArray(__size);
@@ -288,7 +282,7 @@ namespace margelo::nitro::nitroplayer {
     }();
   }
   std::shared_ptr<Promise<std::vector<TrackItem>>> JHybridTrackPlayerSpec::getTracksById(const std::vector<std::string>& trackIds) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JArrayClass<jni::JString>> /* trackIds */)>("getTracksById");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JArrayClass<jni::JString>> /* trackIds */)>("getTracksById");
     auto __result = method(_javaPart, [&]() {
       size_t __size = trackIds.size();
       jni::local_ref<jni::JArrayClass<jni::JString>> __array = jni::JArrayClass<jni::JString>::newArray(__size);
@@ -322,7 +316,7 @@ namespace margelo::nitro::nitroplayer {
     }();
   }
   std::shared_ptr<Promise<std::vector<TrackItem>>> JHybridTrackPlayerSpec::getTracksNeedingUrls() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getTracksNeedingUrls");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getTracksNeedingUrls");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<std::vector<TrackItem>>::create();
@@ -347,7 +341,7 @@ namespace margelo::nitro::nitroplayer {
     }();
   }
   std::shared_ptr<Promise<std::vector<TrackItem>>> JHybridTrackPlayerSpec::getNextTracks(double count) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(double /* count */)>("getNextTracks");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(double /* count */)>("getNextTracks");
     auto __result = method(_javaPart, count);
     return [&]() {
       auto __promise = Promise<std::vector<TrackItem>>::create();
@@ -372,7 +366,7 @@ namespace margelo::nitro::nitroplayer {
     }();
   }
   std::shared_ptr<Promise<double>> JHybridTrackPlayerSpec::getCurrentTrackIndex() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getCurrentTrackIndex");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getCurrentTrackIndex");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<double>::create();
@@ -388,11 +382,11 @@ namespace margelo::nitro::nitroplayer {
     }();
   }
   void JHybridTrackPlayerSpec::onTracksNeedUpdate(const std::function<void(const std::vector<TrackItem>& /* tracks */, double /* lookahead */)>& callback) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__vector_TrackItem__double::javaobject> /* callback */)>("onTracksNeedUpdate_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__vector_TrackItem__double::javaobject> /* callback */)>("onTracksNeedUpdate_cxx");
     method(_javaPart, JFunc_void_std__vector_TrackItem__double_cxx::fromCpp(callback));
   }
   std::shared_ptr<Promise<void>> JHybridTrackPlayerSpec::setPlaybackSpeed(double speed) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(double /* speed */)>("setPlaybackSpeed");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(double /* speed */)>("setPlaybackSpeed");
     auto __result = method(_javaPart, speed);
     return [&]() {
       auto __promise = Promise<void>::create();
@@ -407,7 +401,7 @@ namespace margelo::nitro::nitroplayer {
     }();
   }
   std::shared_ptr<Promise<double>> JHybridTrackPlayerSpec::getPlaybackSpeed() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getPlaybackSpeed");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getPlaybackSpeed");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<double>::create();

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

@@ -18,34 +18,33 @@ namespace margelo::nitro::nitroplayer {
 
   using namespace facebook;
 
-  class JHybridTrackPlayerSpec: public jni::HybridClass<JHybridTrackPlayerSpec, JHybridObject>,
-                                public virtual HybridTrackPlayerSpec {
+  class JHybridTrackPlayerSpec: public virtual HybridTrackPlayerSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/HybridTrackPlayerSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridTrackPlayerSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridTrackPlayerSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/HybridTrackPlayerSpec;";
+      std::shared_ptr<JHybridTrackPlayerSpec> getJHybridTrackPlayerSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitroplayer/HybridTrackPlayerSpec$CxxPart;";
+      static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
+      static void registerNatives();
+      using HybridBase::HybridBase;
+    protected:
+      std::shared_ptr<JHybridObject> createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) override;
+    };
 
   public:
+    explicit JHybridTrackPlayerSpec(const jni::local_ref<JHybridTrackPlayerSpec::JavaPart>& javaPart):
+      HybridObject(HybridTrackPlayerSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridTrackPlayerSpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }
 
   public:
-    size_t getExternalMemorySize() noexcept override;
-    bool equals(const std::shared_ptr<HybridObject>& other) override;
-    void dispose() noexcept override;
-    std::string toString() override;
-
-  public:
-    inline const jni::global_ref<JHybridTrackPlayerSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridTrackPlayerSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -86,9 +85,7 @@ namespace margelo::nitro::nitroplayer {
     std::shared_ptr<Promise<double>> getPlaybackSpeed() override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridTrackPlayerSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridTrackPlayerSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::nitroplayer

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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