VERY experimental Nintendo Switch 2 emulator
C++
android: InputHandler: Convert to object
Charles Lombardo94d24c3b426d
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 7464647c4e..0eda27f7d9 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@@ -58,7 +58,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {var isActivityRecreated = falseprivate lateinit var nfcReader: NfcReader- private lateinit var inputHandler: InputHandlerprivate val gyro = FloatArray(3)private val accel = FloatArray(3)@@ -100,8 +99,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {nfcReader = NfcReader(this)nfcReader.initialize()- inputHandler = InputHandler()- inputHandler.initialize()+ InputHandler.initialize()val preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)if (!preferences.getBoolean(Settings.PREF_MEMORY_WARNING_SHOWN, false)) {@@ -190,7 +188,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {return super.dispatchKeyEvent(event)}- return inputHandler.dispatchKeyEvent(event)+ return InputHandler.dispatchKeyEvent(event)}override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean {@@ -205,7 +203,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {return true}- return inputHandler.dispatchGenericMotionEvent(event)+ return InputHandler.dispatchGenericMotionEvent(event)}override fun onSensorChanged(event: SensorEvent) {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.ktindex e963dfbc17..fec40e27d8 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt@@ -8,7 +8,7 @@ import android.view.MotionEventimport kotlin.math.sqrtimport org.yuzu.yuzu_emu.NativeLibrary-class InputHandler {+object InputHandler {fun initialize() {// Connect first controllerNativeLibrary.onGamePadConnectEvent(getPlayerNumber(NativeLibrary.Player1Device))