zoriya/react-native-omni
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-omni.git synced 2026-08-05 13:46:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(provider): make source optional

Browse Source
This commit is contained in:
zoriya
2026-07-21 19:50:30 +02:00
parent a335509b4e
commit 6eb02d32cb
17 changed files with 57 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nitrogen/generated/android/c++/JHybridOmniPlayerFactorySpec.cpp
Generated
+3 -3
View File
@@ -24,12 +24,12 @@ namespace margelo::nitro::omni { enum class MixAudioMode; }
#include "HybridOmniPlayerSpec.hpp"
#include "JHybridOmniPlayerSpec.hpp"
#include "Source.hpp"
#include <optional>
#include "JSource.hpp"
#include "VideoSrc.hpp"
#include <vector>
#include "JVideoSrc.hpp"
#include <string>
#include <optional>
#include <unordered_map>
#include "Subtitle.hpp"
#include "JSubtitle.hpp"
@@ -71,9 +71,9 @@ namespace margelo::nitro::omni {
// Methods
std::shared_ptr<HybridOmniPlayerSpec> JHybridOmniPlayerFactorySpec::createPlayer(const Source& props) {
std::shared_ptr<HybridOmniPlayerSpec> JHybridOmniPlayerFactorySpec::createPlayer(const std::optional<Source>& props) {
static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JHybridOmniPlayerSpec::JavaPart>(jni::alias_ref<JSource> /* props */)>("createPlayer");
auto __result = method(_javaPart, JSource::fromCpp(props));
auto __result = method(_javaPart, props.has_value() ? JSource::fromCpp(props.value()) : nullptr);
return __result->getJHybridOmniPlayerSpec();
}
nitrogen/generated/android/c++/JHybridOmniPlayerFactorySpec.hpp
Generated
+1 -1
View File
@@ -54,7 +54,7 @@ namespace margelo::nitro::omni {
public:
// Methods
std::shared_ptr<HybridOmniPlayerSpec> createPlayer(const Source& props) override;
std::shared_ptr<HybridOmniPlayerSpec> createPlayer(const std::optional<Source>& props) override;
private:
jni::global_ref<JHybridOmniPlayerFactorySpec::JavaPart> _javaPart;
nitrogen/generated/android/c++/JHybridOmniPlayerSpec.cpp
Generated
+2 -2
View File
@@ -232,9 +232,9 @@ namespace margelo::nitro::omni {
}
// Methods
void JHybridOmniPlayerSpec::setSource(const Source& src) {
void JHybridOmniPlayerSpec::setSource(const std::optional<Source>& src) {
static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JSource> /* src */)>("setSource");
method(_javaPart, JSource::fromCpp(src));
method(_javaPart, src.has_value() ? JSource::fromCpp(src.value()) : nullptr);
}
void JHybridOmniPlayerSpec::play() {
static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("play");
nitrogen/generated/android/c++/JHybridOmniPlayerSpec.hpp
Generated
+1 -1
View File
@@ -76,7 +76,7 @@ namespace margelo::nitro::omni {
public:
// Methods
void setSource(const Source& src) override;
void setSource(const std::optional<Source>& src) override;
void play() override;
void pause() override;
void seekBy(double offset) override;
nitrogen/generated/android/c++/JSource.hpp
Generated
+5 -1
View File
@@ -54,6 +54,8 @@ namespace margelo::nitro::omni {
jni::local_ref<JMetadata> metadata = this->getFieldValue(fieldMetadata);
static const auto fieldMixAudio = clazz->getField<JMixAudioMode>("mixAudio");
jni::local_ref<JMixAudioMode> mixAudio = this->getFieldValue(fieldMixAudio);
static const auto fieldCastId = clazz->getField<jni::JString>("castId");
jni::local_ref<jni::JString> castId = this->getFieldValue(fieldCastId);
static const auto fieldCastData = clazz->getField<jni::JMap<jni::JString, jni::JString>>("castData");
jni::local_ref<jni::JMap<jni::JString, jni::JString>> castData = this->getFieldValue(fieldCastData);
return Source(
@@ -90,6 +92,7 @@ namespace margelo::nitro::omni {
}(fonts)) : std::nullopt,
metadata != nullptr ? std::make_optional(metadata->toCpp()) : std::nullopt,
mixAudio != nullptr ? std::make_optional(mixAudio->toCpp()) : std::nullopt,
castId != nullptr ? std::make_optional(castId->toStdString()) : std::nullopt,
castData != nullptr ? std::make_optional([&]() {
std::unordered_map<std::string, std::string> __map;
__map.reserve(castData->size());
@@ -107,7 +110,7 @@ namespace margelo::nitro::omni {
*/
[[maybe_unused]]
static jni::local_ref<JSource::javaobject> fromCpp(const Source& value) {
using JSignature = JSource(jni::alias_ref<jni::JArrayClass<JVideoSrc>>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JArrayClass<JSubtitle>>, jni::alias_ref<jni::JArrayClass<jni::JString>>, jni::alias_ref<JMetadata>, jni::alias_ref<JMixAudioMode>, jni::alias_ref<jni::JMap<jni::JString, jni::JString>>);
using JSignature = JSource(jni::alias_ref<jni::JArrayClass<JVideoSrc>>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JArrayClass<JSubtitle>>, jni::alias_ref<jni::JArrayClass<jni::JString>>, jni::alias_ref<JMetadata>, jni::alias_ref<JMixAudioMode>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JMap<jni::JString, jni::JString>>);
static const auto clazz = javaClassStatic();
static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
return create(
@@ -145,6 +148,7 @@ namespace margelo::nitro::omni {
}(value.fonts.value()) : nullptr,
value.metadata.has_value() ? JMetadata::fromCpp(value.metadata.value()) : nullptr,
value.mixAudio.has_value() ? JMixAudioMode::fromCpp(value.mixAudio.value()) : nullptr,
value.castId.has_value() ? jni::make_jstring(value.castId.value()) : nullptr,
value.castData.has_value() ? [&]() -> jni::local_ref<jni::JMap<jni::JString, jni::JString>> {
auto __map = jni::JHashMap<jni::JString, jni::JString>::create(value.castData.value().size());
for (const auto& __entry : value.castData.value()) {
nitrogen/generated/android/kotlin/com/margelo/nitro/omni/HybridOmniPlayerFactorySpec.kt
Generated
+1 -1
View File
@@ -30,7 +30,7 @@ abstract class HybridOmniPlayerFactorySpec: HybridObject() {
// Methods
@DoNotStrip
@Keep
abstract fun createPlayer(props: Source): HybridOmniPlayerSpec
abstract fun createPlayer(props: Source?): HybridOmniPlayerSpec
// Default implementation of `HybridObject.toString()`
override fun toString(): String {
nitrogen/generated/android/kotlin/com/margelo/nitro/omni/HybridOmniPlayerSpec.kt
Generated
+1 -1
View File
@@ -110,7 +110,7 @@ abstract class HybridOmniPlayerSpec: HybridObject() {
// Methods
@DoNotStrip
@Keep
abstract fun setSource(src: Source): Unit
abstract fun setSource(src: Source?): Unit
@DoNotStrip
@Keep
nitrogen/generated/android/kotlin/com/margelo/nitro/omni/Source.kt
Generated
+7 -2
View File
@@ -38,6 +38,9 @@ data class Source(
val mixAudio: MixAudioMode?,
@DoNotStrip
@Keep
val castId: String?,
@DoNotStrip
@Keep
val castData: Map<String, String>?
) {
/* primary constructor */
@@ -51,6 +54,7 @@ data class Source(
&& Objects.deepEquals(this.fonts, other.fonts)
&& Objects.deepEquals(this.metadata, other.metadata)
&& Objects.deepEquals(this.mixAudio, other.mixAudio)
&& Objects.deepEquals(this.castId, other.castId)
&& Objects.deepEquals(this.castData, other.castData)
}
@@ -62,6 +66,7 @@ data class Source(
fonts,
metadata,
mixAudio,
castId,
castData
).contentDeepHashCode()
}
@@ -74,8 +79,8 @@ data class Source(
@Keep
@Suppress("unused")
@JvmStatic
private fun fromCpp(src: Array<VideoSrc>, startTime: Double?, subtitles: Array<Subtitle>, fonts: Array<String>?, metadata: Metadata?, mixAudio: MixAudioMode?, castData: Map<String, String>?): Source {
return Source(src, startTime, subtitles, fonts, metadata, mixAudio, castData)
private fun fromCpp(src: Array<VideoSrc>, startTime: Double?, subtitles: Array<Subtitle>, fonts: Array<String>?, metadata: Metadata?, mixAudio: MixAudioMode?, castId: String?, castData: Map<String, String>?): Source {
return Source(src, startTime, subtitles, fonts, metadata, mixAudio, castId, castData)
}
}
}
nitrogen/generated/shared/c++/HybridOmniPlayerFactorySpec.hpp
Generated
+2 -1
View File
@@ -21,6 +21,7 @@ namespace margelo::nitro::omni { struct Source; }
#include <memory>
#include "HybridOmniPlayerSpec.hpp"
#include "Source.hpp"
#include <optional>
namespace margelo::nitro::omni {
@@ -53,7 +54,7 @@ namespace margelo::nitro::omni {
public:
// Methods
virtual std::shared_ptr<HybridOmniPlayerSpec> createPlayer(const Source& props) = 0;
virtual std::shared_ptr<HybridOmniPlayerSpec> createPlayer(const std::optional<Source>& props) = 0;
protected:
// Hybrid Setup
nitrogen/generated/shared/c++/HybridOmniPlayerSpec.hpp
Generated
+1 -1
View File
@@ -89,7 +89,7 @@ namespace margelo::nitro::omni {
public:
// Methods
virtual void setSource(const Source& src) = 0;
virtual void setSource(const std::optional<Source>& src) = 0;
virtual void play() = 0;
virtual void pause() = 0;
virtual void seekBy(double offset) = 0;
nitrogen/generated/shared/c++/Source.hpp
Generated
+5 -1
View File
@@ -59,11 +59,12 @@ namespace margelo::nitro::omni {
std::optional<std::vector<std::string>> fonts SWIFT_PRIVATE;
std::optional<Metadata> metadata SWIFT_PRIVATE;
std::optional<MixAudioMode> mixAudio SWIFT_PRIVATE;
std::optional<std::string> castId SWIFT_PRIVATE;
std::optional<std::unordered_map<std::string, std::string>> castData SWIFT_PRIVATE;
public:
Source() = default;
explicit Source(std::vector<VideoSrc> src, std::optional<double> startTime, std::vector<Subtitle> subtitles, std::optional<std::vector<std::string>> fonts, std::optional<Metadata> metadata, std::optional<MixAudioMode> mixAudio, std::optional<std::unordered_map<std::string, std::string>> castData): src(src), startTime(startTime), subtitles(subtitles), fonts(fonts), metadata(metadata), mixAudio(mixAudio), castData(castData) {}
explicit Source(std::vector<VideoSrc> src, std::optional<double> startTime, std::vector<Subtitle> subtitles, std::optional<std::vector<std::string>> fonts, std::optional<Metadata> metadata, std::optional<MixAudioMode> mixAudio, std::optional<std::string> castId, std::optional<std::unordered_map<std::string, std::string>> castData): src(src), startTime(startTime), subtitles(subtitles), fonts(fonts), metadata(metadata), mixAudio(mixAudio), castId(castId), castData(castData) {}
public:
friend bool operator==(const Source& lhs, const Source& rhs) = default;
@@ -85,6 +86,7 @@ namespace margelo::nitro {
JSIConverter<std::optional<std::vector<std::string>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "fonts"))),
JSIConverter<std::optional<margelo::nitro::omni::Metadata>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "metadata"))),
JSIConverter<std::optional<margelo::nitro::omni::MixAudioMode>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "mixAudio"))),
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "castId"))),
JSIConverter<std::optional<std::unordered_map<std::string, std::string>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "castData")))
);
}
@@ -96,6 +98,7 @@ namespace margelo::nitro {
obj.setProperty(runtime, PropNameIDCache::get(runtime, "fonts"), JSIConverter<std::optional<std::vector<std::string>>>::toJSI(runtime, arg.fonts));
obj.setProperty(runtime, PropNameIDCache::get(runtime, "metadata"), JSIConverter<std::optional<margelo::nitro::omni::Metadata>>::toJSI(runtime, arg.metadata));
obj.setProperty(runtime, PropNameIDCache::get(runtime, "mixAudio"), JSIConverter<std::optional<margelo::nitro::omni::MixAudioMode>>::toJSI(runtime, arg.mixAudio));
obj.setProperty(runtime, PropNameIDCache::get(runtime, "castId"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.castId));
obj.setProperty(runtime, PropNameIDCache::get(runtime, "castData"), JSIConverter<std::optional<std::unordered_map<std::string, std::string>>>::toJSI(runtime, arg.castData));
return obj;
}
@@ -113,6 +116,7 @@ namespace margelo::nitro {
if (!JSIConverter<std::optional<std::vector<std::string>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "fonts")))) return false;
if (!JSIConverter<std::optional<margelo::nitro::omni::Metadata>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "metadata")))) return false;
if (!JSIConverter<std::optional<margelo::nitro::omni::MixAudioMode>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "mixAudio")))) return false;
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "castId")))) return false;
if (!JSIConverter<std::optional<std::unordered_map<std::string, std::string>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "castData")))) return false;
return true;
}
nitrogen/generated/shared/json/OmniViewConfig.json
Generated
+11 -11
View File
@@ -1,13 +1,13 @@
{
"uiViewClassName": "OmniView",
"supportsRawText": false,
"bubblingEventTypes": {},
"directEventTypes": {},
"validAttributes": {
"player": true,
"autoplay": true,
"autoPip": true,
"subtitleAssets": true,
"hybridRef": true
}
"uiViewClassName": "OmniView",
"supportsRawText": false,
"bubblingEventTypes": {},
"directEventTypes": {},
"validAttributes": {
"player": true,
"autoplay": true,
"autoPip": true,
"subtitleAssets": true,
"hybridRef": true
}
}