Archive/azahar
0
0
Fork 0
mirror of https://github.com/azahar-emu/azahar.git synced 2025-04-28 13:47:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

android: Clean up the turbo speed hotkey implementation

Browse source
This commit is contained in:
Briar 2025-04-11 22:30:11 +02:00 • committed by OpenSauce
parent 2a7a5078fc
commit bf4eef8e58
3 changed files with 0 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt
View file

@ -186,17 +186,6 @@ object NativeLibrary {
external fun unlinkConsole() external fun unlinkConsole()
/**
* Turbo speed.
*/
external fun toggleTurboSpeed(enabled: Boolean)
external fun getTurboSpeedSlider(): Int
external fun setTurboSpeedSlider(value: Int)
private var coreErrorAlertResult = false private var coreErrorAlertResult = false
private val coreErrorAlertLock = Object() private val coreErrorAlertLock = Object()

5
src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/HotkeyFunctions.kt
View file

@ -27,12 +27,8 @@ class HotkeyFunctions (
fun toggleTurboSpeed() { fun toggleTurboSpeed() {
if (isTurboSpeedEnabled) { if (isTurboSpeedEnabled) {
normalSpeed = IntSetting.FRAME_LIMIT.int normalSpeed = IntSetting.FRAME_LIMIT.int
NativeLibrary.toggleTurboSpeed(true)
NativeLibrary.setTurboSpeedSlider(IntSetting.TURBO_SPEED.int)
IntSetting.FRAME_LIMIT.int = IntSetting.TURBO_SPEED.int IntSetting.FRAME_LIMIT.int = IntSetting.TURBO_SPEED.int
} else { } else {
NativeLibrary.toggleTurboSpeed(false)
NativeLibrary.setTurboSpeedSlider(normalSpeed)
IntSetting.FRAME_LIMIT.int = normalSpeed IntSetting.FRAME_LIMIT.int = normalSpeed
} }
@ -47,7 +43,6 @@ class HotkeyFunctions (
fun resetTurboSpeed() { fun resetTurboSpeed() {
if (isTurboSpeedEnabled) { if (isTurboSpeedEnabled) {
isTurboSpeedEnabled = false isTurboSpeedEnabled = false
NativeLibrary.toggleTurboSpeed(false)
IntSetting.FRAME_LIMIT.int = normalSpeed IntSetting.FRAME_LIMIT.int = normalSpeed
settings.saveSetting(IntSetting.FRAME_LIMIT, SettingsFile.FILE_NAME_CONFIG) settings.saveSetting(IntSetting.FRAME_LIMIT, SettingsFile.FILE_NAME_CONFIG)

16
src/android/app/src/main/jni/native.cpp
View file

@ -773,22 +773,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()); 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) { jboolean Java_org_citra_citra_1emu_NativeLibrary_isFullConsoleLinked(JNIEnv* env, jobject obj) {
return HW::UniqueData::IsFullConsoleLinked(); return HW::UniqueData::IsFullConsoleLinked();
} }