VERY experimental Nintendo Switch 2 emulator
C++
Fix JNI and expose mute settings to Android
Abandoned Cart777567975e37
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.ktindex f860cdd4bd..6a4e070461 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt@@ -313,6 +313,21 @@ object NativeLibrary {*/external fun isPaused(): Boolean+ /**+ * Mutes emulation sound+ */+ external fun muteAudio(): Boolean++ /**+ * Unmutes emulation sound+ */+ external fun unMuteAudio(): Boolean++ /**+ * Returns true if emulation audio is muted.+ */+ external fun isMuted(): Boolean+/*** Returns the performance stats for the current game*/diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.ktindex 8a071f4da5..b77c21380d 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt@@ -64,9 +64,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {private val actionPause = "ACTION_EMULATOR_PAUSE"private val actionPlay = "ACTION_EMULATOR_PLAY"private val actionMute = "ACTION_EMULATOR_MUTE"- private val actionAudio = "ACTION_EMULATOR_AUDIO"- private var isAudioMuted = false- private var userAudio = IntSetting.AUDIO_VOLUME.int+ private val actionSound = "ACTION_EMULATOR_SOUND"private val settingsViewModel: SettingsViewModel by viewModels()@@ -309,21 +307,21 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {pictureInPictureActions.add(pauseRemoteAction)}- if (isAudioMuted) {- val audioIcon = Icon.createWithResource(this@EmulationActivity, R.drawable.ic_pip_audio)- val audioPendingIntent = PendingIntent.getBroadcast(+ if (NativeLibrary.isMuted()) {+ val soundIcon = Icon.createWithResource(this@EmulationActivity, R.drawable.ic_pip_sound)+ val soundPendingIntent = PendingIntent.getBroadcast(this@EmulationActivity,- R.drawable.ic_pip_audio,- Intent(actionAudio),+ R.drawable.ic_pip_sound,+ Intent(actionSound),pendingFlags)- val audioRemoteAction = RemoteAction(- audioIcon,- getString(R.string.audio),- getString(R.string.audio),- audioPendingIntent+ val soundRemoteAction = RemoteAction(+ soundIcon,+ getString(R.string.sound),+ getString(R.string.sound),+ soundPendingIntent)- pictureInPictureActions.add(audioRemoteAction)+ pictureInPictureActions.add(soundRemoteAction)} else {val muteIcon = Icon.createWithResource(this@EmulationActivity, R.drawable.ic_pip_mute)val mutePendingIntent = PendingIntent.getBroadcast(@@ -362,17 +360,10 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {} else if (intent.action == actionPause) {if (!NativeLibrary.isPaused()) NativeLibrary.pauseEmulation()}- if (intent.action == actionAudio) {- if (isAudioMuted) {- IntSetting.AUDIO_VOLUME.int = userAudio- isAudioMuted = false- }+ if (intent.action == actionSound) {+ if (NativeLibrary.isMuted()) NativeLibrary.unMuteAudio()} else if (intent.action == actionMute) {- if (!isAudioMuted) {- isAudioMuted = true- userAudio = IntSetting.AUDIO_VOLUME.int- IntSetting.AUDIO_VOLUME.int = 0- }+ if (!NativeLibrary.isMuted()) NativeLibrary.muteAudio()}buildPictureInPictureParams()}@@ -387,6 +378,8 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {IntentFilter().apply {addAction(actionPause)addAction(actionPlay)+ addAction(actionMute)+ addAction(actionSound)}.also {registerReceiver(pictureInPictureReceiver, it)}@@ -395,6 +388,8 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {unregisterReceiver(pictureInPictureReceiver)} catch (ignored: Exception) {}+ // Always resume audio, since there is no UI button+ if (NativeLibrary.isMuted()) NativeLibrary.unMuteAudio()}}diff --git a/src/android/app/src/main/jni/CMakeLists.txt b/src/android/app/src/main/jni/CMakeLists.txtindex 0417815770..e2ed08e9fc 100644--- a/src/android/app/src/main/jni/CMakeLists.txt+++ b/src/android/app/src/main/jni/CMakeLists.txt@@ -14,7 +14,6 @@ add_library(yuzu-android SHAREDid_cache.cppid_cache.hnative.cpp- native.h)set_property(TARGET yuzu-android PROPERTY IMPORTED_LOCATION ${FFmpeg_LIBRARY_DIR})diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cppindex 632aa50b34..07c2a7850a 100644--- a/src/android/app/src/main/jni/native.cpp+++ b/src/android/app/src/main/jni/native.cpp@@ -14,6 +14,7 @@#include <android/api-level.h>#include <android/native_window_jni.h>#include <core/loader/nro.h>+#include <jni.h>#include "common/detached_tasks.h"#include "common/dynamic_library.h"@@ -526,35 +527,32 @@ static Core::SystemResultStatus RunEmulation(const std::string& filepath) {extern "C" {-void Java_org_yuzu_yuzu_1emu_NativeLibrary_surfaceChanged(JNIEnv* env,- [[maybe_unused]] jclass clazz,- jobject surf) {+void Java_org_yuzu_yuzu_1emu_NativeLibrary_surfaceChanged(JNIEnv* env, jclass clazz, jobject surf) {EmulationSession::GetInstance().SetNativeWindow(ANativeWindow_fromSurface(env, surf));EmulationSession::GetInstance().SurfaceChanged();}-void Java_org_yuzu_yuzu_1emu_NativeLibrary_surfaceDestroyed(JNIEnv* env,- [[maybe_unused]] jclass clazz) {+void Java_org_yuzu_yuzu_1emu_NativeLibrary_surfaceDestroyed(JNIEnv* env, jclass clazz) {ANativeWindow_release(EmulationSession::GetInstance().NativeWindow());EmulationSession::GetInstance().SetNativeWindow(nullptr);EmulationSession::GetInstance().SurfaceChanged();}-void Java_org_yuzu_yuzu_1emu_NativeLibrary_setAppDirectory(JNIEnv* env,- [[maybe_unused]] jclass clazz,+void Java_org_yuzu_yuzu_1emu_NativeLibrary_setAppDirectory(JNIEnv* env, jclass clazz,jstring j_directory) {Common::FS::SetAppDirectory(GetJString(env, j_directory));}-int Java_org_yuzu_yuzu_1emu_NativeLibrary_installFileToNand(JNIEnv* env,- [[maybe_unused]] jclass clazz,+int Java_org_yuzu_yuzu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jclass clazz,jstring j_file) {return EmulationSession::GetInstance().InstallFileToNand(GetJString(env, j_file));}-void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeGpuDriver(- JNIEnv* env, [[maybe_unused]] jclass clazz, jstring hook_lib_dir, jstring custom_driver_dir,- jstring custom_driver_name, jstring file_redirect_dir) {+void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeGpuDriver(JNIEnv* env, jclass clazz,+ jstring hook_lib_dir,+ jstring custom_driver_dir,+ jstring custom_driver_name,+ jstring file_redirect_dir) {EmulationSession::GetInstance().InitializeGpuDriver(GetJString(env, hook_lib_dir), GetJString(env, custom_driver_dir),GetJString(env, custom_driver_name), GetJString(env, file_redirect_dir));@@ -571,7 +569,7 @@ void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeGpuDriver(}jboolean JNICALL Java_org_yuzu_yuzu_1emu_utils_GpuDriverHelper_supportsCustomDriverLoading(- [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject instance) {+ JNIEnv* env, [[maybe_unused]] jobject instance) {#ifdef ARCHITECTURE_arm64// If the KGSL device exists custom drivers can be loaded using adrenotoolsreturn SupportsCustomDriver();@@ -580,49 +578,52 @@ jboolean JNICALL Java_org_yuzu_yuzu_1emu_utils_GpuDriverHelper_supportsCustomDri#endif}-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_reloadKeys(JNIEnv* env,- [[maybe_unused]] jclass clazz) {+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_reloadKeys(JNIEnv* env, jclass clazz) {Core::Crypto::KeyManager::Instance().ReloadKeys();return static_cast<jboolean>(Core::Crypto::KeyManager::Instance().AreKeysLoaded());}-void Java_org_yuzu_yuzu_1emu_NativeLibrary_unPauseEmulation([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz) {+void Java_org_yuzu_yuzu_1emu_NativeLibrary_unPauseEmulation(JNIEnv* env, jclass clazz) {EmulationSession::GetInstance().UnPauseEmulation();}-void Java_org_yuzu_yuzu_1emu_NativeLibrary_pauseEmulation([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz) {+void Java_org_yuzu_yuzu_1emu_NativeLibrary_pauseEmulation(JNIEnv* env, jclass clazz) {EmulationSession::GetInstance().PauseEmulation();}-void Java_org_yuzu_yuzu_1emu_NativeLibrary_stopEmulation([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz) {+void Java_org_yuzu_yuzu_1emu_NativeLibrary_stopEmulation(JNIEnv* env, jclass clazz) {EmulationSession::GetInstance().HaltEmulation();}-void Java_org_yuzu_yuzu_1emu_NativeLibrary_resetRomMetadata([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz) {+void Java_org_yuzu_yuzu_1emu_NativeLibrary_resetRomMetadata(JNIEnv* env, jclass clazz) {EmulationSession::GetInstance().ResetRomMetadata();}-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isRunning([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz) {+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isRunning(JNIEnv* env, jclass clazz) {return static_cast<jboolean>(EmulationSession::GetInstance().IsRunning());}-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isPaused([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz) {+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isPaused(JNIEnv* env, jclass clazz) {return static_cast<jboolean>(EmulationSession::GetInstance().IsPaused());}-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isHandheldOnly([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz) {+void Java_org_yuzu_yuzu_1emu_NativeLibrary_muteAduio(JNIEnv* env, jclass clazz) {+ Settings::values.audio_muted = true;+}++void Java_org_yuzu_yuzu_1emu_NativeLibrary_unMuteAudio(JNIEnv* env, jclass clazz) {+ Settings::values.audio_muted = false;+}++jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isMuted(JNIEnv* env, jclass clazz) {+ return static_cast<jboolean>(Settings::values.audio_muted.GetValue());+}++jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isHandheldOnly(JNIEnv* env, jclass clazz) {return EmulationSession::GetInstance().IsHandheldOnly();}-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_setDeviceType([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz,+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_setDeviceType(JNIEnv* env, jclass clazz,jint j_device, jint j_type) {if (EmulationSession::GetInstance().IsRunning()) {EmulationSession::GetInstance().SetDeviceType(j_device, j_type);@@ -630,8 +631,7 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_setDeviceType([[maybe_unused]] JNreturn static_cast<jboolean>(true);}-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadConnectEvent([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz,+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadConnectEvent(JNIEnv* env, jclass clazz,jint j_device) {if (EmulationSession::GetInstance().IsRunning()) {EmulationSession::GetInstance().OnGamepadConnectEvent(j_device);@@ -639,15 +639,14 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadConnectEvent([[maybe_unureturn static_cast<jboolean>(true);}-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadDisconnectEvent(- [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint j_device) {+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadDisconnectEvent(JNIEnv* env, jclass clazz,+ jint j_device) {if (EmulationSession::GetInstance().IsRunning()) {EmulationSession::GetInstance().OnGamepadDisconnectEvent(j_device);}return static_cast<jboolean>(true);}-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadButtonEvent([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz,+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadButtonEvent(JNIEnv* env, jclass clazz,[[maybe_unused]] jint j_device,jint j_button, jint action) {if (EmulationSession::GetInstance().IsRunning()) {@@ -659,8 +658,7 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadButtonEvent([[maybe_unusreturn static_cast<jboolean>(true);}-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadJoystickEvent([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz,+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadJoystickEvent(JNIEnv* env, jclass clazz,jint j_device, jint stick_id,jfloat x, jfloat y) {if (EmulationSession::GetInstance().IsRunning()) {@@ -670,9 +668,8 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadJoystickEvent([[maybe_un}jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadMotionEvent(- [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint j_device,- jlong delta_timestamp, jfloat gyro_x, jfloat gyro_y, jfloat gyro_z, jfloat accel_x,- jfloat accel_y, jfloat accel_z) {+ JNIEnv* env, jclass clazz, jint j_device, jlong delta_timestamp, jfloat gyro_x, jfloat gyro_y,+ jfloat gyro_z, jfloat accel_x, jfloat accel_y, jfloat accel_z) {if (EmulationSession::GetInstance().IsRunning()) {EmulationSession::GetInstance().Window().OnGamepadMotionEvent(j_device, delta_timestamp, gyro_x, gyro_y, gyro_z, accel_x, accel_y, accel_z);@@ -680,8 +677,7 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadMotionEvent(return static_cast<jboolean>(true);}-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onReadNfcTag([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz,+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onReadNfcTag(JNIEnv* env, jclass clazz,jbyteArray j_data) {jboolean isCopy{false};std::span<u8> data(reinterpret_cast<u8*>(env->GetByteArrayElements(j_data, &isCopy)),@@ -693,39 +689,34 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onReadNfcTag([[maybe_unused]] JNIreturn static_cast<jboolean>(true);}-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onRemoveNfcTag([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz) {+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onRemoveNfcTag(JNIEnv* env, jclass clazz) {if (EmulationSession::GetInstance().IsRunning()) {EmulationSession::GetInstance().Window().OnRemoveNfcTag();}return static_cast<jboolean>(true);}-void Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchPressed([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz, jint id,+void Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchPressed(JNIEnv* env, jclass clazz, jint id,jfloat x, jfloat y) {if (EmulationSession::GetInstance().IsRunning()) {EmulationSession::GetInstance().Window().OnTouchPressed(id, x, y);}}-void Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchMoved([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz, jint id,+void Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchMoved(JNIEnv* env, jclass clazz, jint id,jfloat x, jfloat y) {if (EmulationSession::GetInstance().IsRunning()) {EmulationSession::GetInstance().Window().OnTouchMoved(id, x, y);}}-void Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchReleased([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz, jint id) {+void Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchReleased(JNIEnv* env, jclass clazz, jint id) {if (EmulationSession::GetInstance().IsRunning()) {EmulationSession::GetInstance().Window().OnTouchReleased(id);}}-jbyteArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getIcon([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz,+jbyteArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getIcon(JNIEnv* env, jclass clazz,[[maybe_unused]] jstring j_filename) {auto icon_data = EmulationSession::GetInstance().GetRomIcon(GetJString(env, j_filename));jbyteArray icon = env->NewByteArray(static_cast<jsize>(icon_data.size()));@@ -734,67 +725,58 @@ jbyteArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getIcon([[maybe_unused]] JNIEnvreturn icon;}-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getTitle([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz,+jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getTitle(JNIEnv* env, jclass clazz,[[maybe_unused]] jstring j_filename) {auto title = EmulationSession::GetInstance().GetRomTitle(GetJString(env, j_filename));return env->NewStringUTF(title.c_str());}-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getDescription([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz,+jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getDescription(JNIEnv* env, jclass clazz,jstring j_filename) {return j_filename;}-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getGameId([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz,+jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getGameId(JNIEnv* env, jclass clazz,jstring j_filename) {return j_filename;}-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getRegions([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz,+jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getRegions(JNIEnv* env, jclass clazz,[[maybe_unused]] jstring j_filename) {return env->NewStringUTF("");}-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getCompany([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz,+jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getCompany(JNIEnv* env, jclass clazz,[[maybe_unused]] jstring j_filename) {return env->NewStringUTF("");}-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isHomebrew([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz,+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isHomebrew(JNIEnv* env, jclass clazz,[[maybe_unused]] jstring j_filename) {return EmulationSession::GetInstance().GetIsHomebrew(GetJString(env, j_filename));}void Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeEmulation- [[maybe_unused]] (JNIEnv* env, [[maybe_unused]] jclass clazz) {+ [[maybe_unused]] (JNIEnv* env, jclass clazz) {// Create the default config.ini.Config{};// Initialize the emulated system.EmulationSession::GetInstance().System().Initialize();}-jint Java_org_yuzu_yuzu_1emu_NativeLibrary_defaultCPUCore([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz) {+jint Java_org_yuzu_yuzu_1emu_NativeLibrary_defaultCPUCore(JNIEnv* env, jclass clazz) {return {};}void Java_org_yuzu_yuzu_1emu_NativeLibrary_run__Ljava_lang_String_2Ljava_lang_String_2Z(- [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, [[maybe_unused]] jstring j_file,+ JNIEnv* env, jclass clazz, [[maybe_unused]] jstring j_file,[[maybe_unused]] jstring j_savestate, [[maybe_unused]] jboolean j_delete_savestate) {}-void Java_org_yuzu_yuzu_1emu_NativeLibrary_reloadSettings([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz) {+void Java_org_yuzu_yuzu_1emu_NativeLibrary_reloadSettings(JNIEnv* env, jclass clazz) {Config{};}-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getUserSetting([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz,+jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getUserSetting(JNIEnv* env, jclass clazz,jstring j_game_id, jstring j_section,jstring j_key) {std::string_view game_id = env->GetStringUTFChars(j_game_id, 0);@@ -808,8 +790,7 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getUserSetting([[maybe_unused]] JNreturn env->NewStringUTF("");}-void Java_org_yuzu_yuzu_1emu_NativeLibrary_setUserSetting([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz,+void Java_org_yuzu_yuzu_1emu_NativeLibrary_setUserSetting(JNIEnv* env, jclass clazz,jstring j_game_id, jstring j_section,jstring j_key, jstring j_value) {std::string_view game_id = env->GetStringUTFChars(j_game_id, 0);@@ -823,16 +804,14 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_setUserSetting([[maybe_unused]] JNIEnenv->ReleaseStringUTFChars(j_value, value.data());}-void Java_org_yuzu_yuzu_1emu_NativeLibrary_initGameIni([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz,+void Java_org_yuzu_yuzu_1emu_NativeLibrary_initGameIni(JNIEnv* env, jclass clazz,jstring j_game_id) {std::string_view game_id = env->GetStringUTFChars(j_game_id, 0);env->ReleaseStringUTFChars(j_game_id, game_id.data());}-jdoubleArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getPerfStats([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz) {+jdoubleArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getPerfStats(JNIEnv* env, jclass clazz) {jdoubleArray j_stats = env->NewDoubleArray(4);if (EmulationSession::GetInstance().IsRunning()) {@@ -848,11 +827,11 @@ jdoubleArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getPerfStats([[maybe_unused]]return j_stats;}-void Java_org_yuzu_yuzu_1emu_utils_DirectoryInitialization_setSysDirectory(- [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jstring j_path) {}+void Java_org_yuzu_yuzu_1emu_utils_DirectoryInitialization_setSysDirectory(JNIEnv* env,+ jclass clazz,+ jstring j_path) {}-void Java_org_yuzu_yuzu_1emu_NativeLibrary_run__Ljava_lang_String_2([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz,+void Java_org_yuzu_yuzu_1emu_NativeLibrary_run__Ljava_lang_String_2(JNIEnv* env, jclass clazz,jstring j_path) {const std::string path = GetJString(env, j_path);@@ -863,8 +842,7 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_run__Ljava_lang_String_2([[maybe_unus}}-void Java_org_yuzu_yuzu_1emu_NativeLibrary_logDeviceInfo([[maybe_unused]] JNIEnv* env,- [[maybe_unused]] jclass clazz) {+void Java_org_yuzu_yuzu_1emu_NativeLibrary_logDeviceInfo(JNIEnv* env, jclass clazz) {LOG_INFO(Frontend, "yuzu Version: {}-{}", Common::g_scm_branch, Common::g_scm_desc);LOG_INFO(Frontend, "Host OS: Android API level {}", android_get_device_api_level());}diff --git a/src/android/app/src/main/jni/native.h b/src/android/app/src/main/jni/native.hdeleted file mode 100644index 24dcbbcb8e..0000000000--- a/src/android/app/src/main/jni/native.h+++ /dev/null@@ -1,165 +0,0 @@-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project-// SPDX-License-Identifier: GPL-2.0-or-later--#pragma once--#include <jni.h>--// Function calls from the Java side-#ifdef __cplusplus-extern "C" {-#endif--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_UnPauseEmulation(JNIEnv* env,- jclass clazz);--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_PauseEmulation(JNIEnv* env,- jclass clazz);--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_StopEmulation(JNIEnv* env,- jclass clazz);--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_ResetRomMetadata(JNIEnv* env,- jclass clazz);--JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_IsRunning(JNIEnv* env,- jclass clazz);--JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_isHandheldOnly(JNIEnv* env,- jclass clazz);--JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_setDeviceType(JNIEnv* env,- jclass clazz,- jstring j_device,- jstring j_type);--JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadConnectEvent(- JNIEnv* env, jclass clazz, jstring j_device);--JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadDisconnectEvent(- JNIEnv* env, jclass clazz, jstring j_device);--JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadEvent(- JNIEnv* env, jclass clazz, jstring j_device, jint j_button, jint action);--JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadMoveEvent(- JNIEnv* env, jclass clazz, jstring j_device, jint axis, jfloat x, jfloat y);--JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadAxisEvent(- JNIEnv* env, jclass clazz, jstring j_device, jint axis_id, jfloat axis_val);--JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onReadNfcTag(JNIEnv* env,- jclass clazz,- jbyteArray j_data);--JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onRemoveNfcTag(JNIEnv* env,- jclass clazz);--JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchEvent(JNIEnv* env,- jclass clazz,- jfloat x, jfloat y,- jboolean pressed);--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchMoved(JNIEnv* env, jclass clazz,- jfloat x, jfloat y);--JNIEXPORT jbyteArray JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_GetIcon(JNIEnv* env,- jclass clazz,- jstring j_file);--JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_GetTitle(JNIEnv* env, jclass clazz,- jstring j_filename);--JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_GetDescription(JNIEnv* env,- jclass clazz,- jstring j_filename);--JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_GetGameId(JNIEnv* env, jclass clazz,- jstring j_filename);--JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_GetRegions(JNIEnv* env,- jclass clazz,- jstring j_filename);--JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_GetCompany(JNIEnv* env,- jclass clazz,- jstring j_filename);--JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_GetGitRevision(JNIEnv* env,- jclass clazz);--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_SetAppDirectory(JNIEnv* env,- jclass clazz,- jstring j_directory);--JNIEXPORT void JNICALL-Java_org_yuzu_yuzu_1emu_NativeLibrary_Java_org_yuzu_yuzu_1emu_NativeLibrary_InitializeGpuDriver(- JNIEnv* env, jclass clazz, jstring hook_lib_dir, jstring custom_driver_dir,- jstring custom_driver_name, jstring file_redirect_dir);--JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_ReloadKeys(JNIEnv* env,- jclass clazz);--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_utils_DirectoryInitialization_SetSysDirectory(- JNIEnv* env, jclass clazz, jstring path_);--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_SetSysDirectory(JNIEnv* env,- jclass clazz,- jstring path);--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_InitializeEmulation(JNIEnv* env,- jclass clazz);--JNIEXPORT jint JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_DefaultCPUCore(JNIEnv* env,- jclass clazz);-JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_SetProfiling(JNIEnv* env, jclass clazz,- jboolean enable);--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_WriteProfileResults(JNIEnv* env,- jclass clazz);--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_NotifyOrientationChange(- JNIEnv* env, jclass clazz, jint layout_option, jint rotation);--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_Run__Ljava_lang_String_2(- JNIEnv* env, jclass clazz, jstring j_path);--JNIEXPORT void JNICALL-Java_org_yuzu_yuzu_1emu_NativeLibrary_Run__Ljava_lang_String_2Ljava_lang_String_2Z(- JNIEnv* env, jclass clazz, jstring j_file, jstring j_savestate, jboolean j_delete_savestate);--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_SurfaceChanged(JNIEnv* env,- jclass clazz,- jobject surf);--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_SurfaceDestroyed(JNIEnv* env,- jclass clazz);--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_InitGameIni(JNIEnv* env, jclass clazz,- jstring j_game_id);--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_ReloadSettings(JNIEnv* env,- jclass clazz);--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_SetUserSetting(- JNIEnv* env, jclass clazz, jstring j_game_id, jstring j_section, jstring j_key,- jstring j_value);--JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_GetUserSetting(- JNIEnv* env, jclass clazz, jstring game_id, jstring section, jstring key);--JNIEXPORT jdoubleArray JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_GetPerfStats(JNIEnv* env,- jclass clazz);--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_LogDeviceInfo(JNIEnv* env,- jclass clazz);--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_SubmitInlineKeyboardText(- JNIEnv* env, jclass clazz, jstring j_text);--JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_SubmitInlineKeyboardInput(- JNIEnv* env, jclass clazz, jint j_key_code);--#ifdef __cplusplus-}-#endifdiff --git a/src/android/app/src/main/res/drawable/ic_pip_audio.xml b/src/android/app/src/main/res/drawable/ic_pip_sound.xmlsimilarity index 100%rename from src/android/app/src/main/res/drawable/ic_pip_audio.xmlrename to src/android/app/src/main/res/drawable/ic_pip_sound.xmldiff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xmlindex d4f089c7f9..eb1d83693a 100644--- a/src/android/app/src/main/res/values/strings.xml+++ b/src/android/app/src/main/res/values/strings.xml@@ -388,7 +388,7 @@<string name="pause">Pause</string><string name="play">Play</string><string name="mute">Mute</string>- <string name="audio">Audio</string>+ <string name="sound">Sound</string><!-- Licenses screen strings --><string name="licenses">Licenses</string>