From aa4e494c08075f5d048e8e3d6e0f7426d88d0f0a Mon Sep 17 00:00:00 2001 From: crueter Date: Wed, 2 Sep 2026 00:29:58 +0200 Subject: [android] Replace Oboe audio with SDL3 audio (#4338) Supersedes #4335. Replaces the Oboe audio backend with SDL3, since we already support it. A few caveats: - SDL defines a JVM OnLoad method already, so we have to instead hijack NativeLibrary for id_cache initialization - This also means some internal fields in Double/Integer/Boolean (namely `value`) can't be accessed, so I switched those to methods for now. - SDL Java sources are pulled in from the CI package. - Since we can't use SDLActivity, `SDL.setupJNI()` handles everything Signed-off-by: crueter - [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions). - [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md) - [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability. ------------------- Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4338 Reviewed-by: Lizzie and Samuel Reviewed-by: MaranBr --- src/common/android/android_common.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/common/android/android_common.cpp') diff --git a/src/common/android/android_common.cpp b/src/common/android/android_common.cpp index a1cf081695..5041579e0e 100644 --- a/src/common/android/android_common.cpp +++ b/src/common/android/android_common.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -// SPDX-FileCopyrightText: 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later #include "android_common.h" @@ -51,7 +51,7 @@ jstring ToJString(JNIEnv* env, std::u16string_view str) { } double GetJDouble(JNIEnv* env, jobject jdouble) { - return env->GetDoubleField(jdouble, GetDoubleValueField()); + return env->CallDoubleMethod(jdouble, GetDoubleValueMethod()); } jobject ToJDouble(JNIEnv* env, double value) { @@ -59,7 +59,7 @@ jobject ToJDouble(JNIEnv* env, double value) { } s32 GetJInteger(JNIEnv* env, jobject jinteger) { - return env->GetIntField(jinteger, GetIntegerValueField()); + return env->CallIntMethod(jinteger, GetIntegerValueMethod()); } jobject ToJInteger(JNIEnv* env, s32 value) { @@ -67,7 +67,7 @@ jobject ToJInteger(JNIEnv* env, s32 value) { } bool GetJBoolean(JNIEnv* env, jobject jboolean) { - return env->GetBooleanField(jboolean, GetBooleanValueField()); + return env->CallBooleanMethod(jboolean, GetBooleanValueMethod()); } jobject ToJBoolean(JNIEnv* env, bool value) { -- cgit v1.2.3