From 2fb683c3277561b79d3b6d8dbba4cf3c6a35f6e4 Mon Sep 17 00:00:00 2001
From: Briar <205427297+icy-briar@users.noreply.github.com>
Date: Fri, 11 Apr 2025 22:30:11 +0200
Subject: [PATCH] android: Clean up the turbo speed hotkey implementation

# Conflicts:
#	src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt
---
 .../java/org/citra/citra_emu/NativeLibrary.kt    |  9 ---------
 .../features/hotkeys/HotkeyFunctions.kt          |  5 -----
 src/android/app/src/main/jni/native.cpp          | 16 ----------------
 3 files changed, 30 deletions(-)

diff --git a/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt b/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt
index a4aaf1c75..493f57648 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt
@@ -189,15 +189,6 @@ object NativeLibrary {
     external fun unlinkConsole()
 
 
-    /**
-     * Turbo speed.
-     */
-    external fun toggleTurboSpeed(enabled: Boolean)
-
-    external fun getTurboSpeedSlider(): Int
-
-    external fun setTurboSpeedSlider(value: Int)
-
     external fun downloadTitleFromNus(title: Long): InstallStatus
 
     private var coreErrorAlertResult = false
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/HotkeyFunctions.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/HotkeyFunctions.kt
index e9e49293b..b097c18fb 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/HotkeyFunctions.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/HotkeyFunctions.kt
@@ -27,12 +27,8 @@ class HotkeyFunctions (
     fun toggleTurboSpeed() {
         if (isTurboSpeedEnabled) {
             normalSpeed = IntSetting.FRAME_LIMIT.int
-            NativeLibrary.toggleTurboSpeed(true)
-            NativeLibrary.setTurboSpeedSlider(IntSetting.TURBO_SPEED.int)
             IntSetting.FRAME_LIMIT.int = IntSetting.TURBO_SPEED.int
         } else {
-            NativeLibrary.toggleTurboSpeed(false)
-            NativeLibrary.setTurboSpeedSlider(normalSpeed)
             IntSetting.FRAME_LIMIT.int = normalSpeed
         }
 
@@ -47,7 +43,6 @@ class HotkeyFunctions (
     fun resetTurboSpeed() {
         if (isTurboSpeedEnabled) {
             isTurboSpeedEnabled = false
-            NativeLibrary.toggleTurboSpeed(false)
             IntSetting.FRAME_LIMIT.int = normalSpeed
 
             settings.saveSetting(IntSetting.FRAME_LIMIT, SettingsFile.FILE_NAME_CONFIG)
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp
index 0c9f54c23..70a1d17f8 100644
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -786,22 +786,6 @@ void Java_org_citra_citra_1emu_NativeLibrary_logDeviceInfo([[maybe_unused]] JNIE
     LOG_INFO(Frontend, "Host OS: Android API level {}", android_get_device_api_level());
 }
 
-void JNICALL Java_org_citra_citra_1emu_NativeLibrary_toggleTurboSpeed([[maybe_unused]] JNIEnv* env,
-                                                                      [[maybe_unused]] jobject obj,
-                                                                      jboolean enabled) {
-    Settings::values.turbo_speed = enabled ? true : false;
-}
-
-jint JNICALL Java_org_citra_citra_1emu_NativeLibrary_getTurboSpeedSlider(
-    [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) {
-    return static_cast<jint>(Settings::values.turbo_speed);
-}
-
-void JNICALL Java_org_citra_citra_1emu_NativeLibrary_setTurboSpeedSlider(
-    [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj, jint value) {
-    Settings::values.turbo_speed = value;
-}
-
 jboolean Java_org_citra_citra_1emu_NativeLibrary_isFullConsoleLinked(JNIEnv* env, jobject obj) {
     return HW::UniqueData::IsFullConsoleLinked();
 }