ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11819 from JosJuice/android-input-device-null 

ControllerInterface/Android: Use InputEvent.getDeviceId
This commit is contained in:
Admiral H. Curtiss 2023-05-29 19:27:30 +02:00 committed by GitHub
parent 91b988c67f 82f70cdf94
commit da77084d2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
View File

@ -37,7 +37,6 @@ jclass s_input_device_class;
jmethodID s_input_device_get_device_ids; jmethodID s_input_device_get_device_ids;
jmethodID s_input_device_get_device; jmethodID s_input_device_get_device;
jmethodID s_input_device_get_controller_number; jmethodID s_input_device_get_controller_number;
jmethodID s_input_device_get_id;
jmethodID s_input_device_get_motion_ranges; jmethodID s_input_device_get_motion_ranges;
jmethodID s_input_device_get_name; jmethodID s_input_device_get_name;
jmethodID s_input_device_get_sources; jmethodID s_input_device_get_sources;
@ -50,7 +49,7 @@ jmethodID s_motion_range_get_min;
jmethodID s_motion_range_get_source; jmethodID s_motion_range_get_source;
jclass s_input_event_class; jclass s_input_event_class;
jmethodID s_input_event_get_device; jmethodID s_input_event_get_device_id;
jclass s_key_event_class; jclass s_key_event_class;
jmethodID s_key_event_get_action; jmethodID s_key_event_get_action;
@ -798,7 +797,6 @@ void Init()
env->GetStaticMethodID(s_input_device_class, "getDevice", "(I)Landroid/view/InputDevice;"); env->GetStaticMethodID(s_input_device_class, "getDevice", "(I)Landroid/view/InputDevice;");
s_input_device_get_controller_number = s_input_device_get_controller_number =
env->GetMethodID(s_input_device_class, "getControllerNumber", "()I"); env->GetMethodID(s_input_device_class, "getControllerNumber", "()I");
s_input_device_get_id = env->GetMethodID(s_input_device_class, "getId", "()I");
s_input_device_get_motion_ranges = s_input_device_get_motion_ranges =
env->GetMethodID(s_input_device_class, "getMotionRanges", "()Ljava/util/List;"); env->GetMethodID(s_input_device_class, "getMotionRanges", "()Ljava/util/List;");
s_input_device_get_name = s_input_device_get_name =
@ -817,18 +815,20 @@ void Init()
const jclass input_event_class = env->FindClass("android/view/InputEvent"); const jclass input_event_class = env->FindClass("android/view/InputEvent");
s_input_event_class = reinterpret_cast<jclass>(env->NewGlobalRef(input_event_class)); s_input_event_class = reinterpret_cast<jclass>(env->NewGlobalRef(input_event_class));
s_input_event_get_device = s_input_event_get_device_id = env->GetMethodID(s_input_event_class, "getDeviceId", "()I");
env->GetMethodID(s_input_event_class, "getDevice", "()Landroid/view/InputDevice;"); env->DeleteLocalRef(input_event_class);
const jclass key_event_class = env->FindClass("android/view/KeyEvent"); const jclass key_event_class = env->FindClass("android/view/KeyEvent");
s_key_event_class = reinterpret_cast<jclass>(env->NewGlobalRef(key_event_class)); s_key_event_class = reinterpret_cast<jclass>(env->NewGlobalRef(key_event_class));
s_key_event_get_action = env->GetMethodID(s_key_event_class, "getAction", "()I"); s_key_event_get_action = env->GetMethodID(s_key_event_class, "getAction", "()I");
s_key_event_get_keycode = env->GetMethodID(s_key_event_class, "getKeyCode", "()I"); s_key_event_get_keycode = env->GetMethodID(s_key_event_class, "getKeyCode", "()I");
env->DeleteLocalRef(key_event_class);
const jclass motion_event_class = env->FindClass("android/view/MotionEvent"); const jclass motion_event_class = env->FindClass("android/view/MotionEvent");
s_motion_event_class = reinterpret_cast<jclass>(env->NewGlobalRef(motion_event_class)); s_motion_event_class = reinterpret_cast<jclass>(env->NewGlobalRef(motion_event_class));
s_motion_event_get_axis_value = env->GetMethodID(s_motion_event_class, "getAxisValue", "(I)F"); s_motion_event_get_axis_value = env->GetMethodID(s_motion_event_class, "getAxisValue", "(I)F");
s_motion_event_get_source = env->GetMethodID(s_motion_event_class, "getSource", "()I"); s_motion_event_get_source = env->GetMethodID(s_motion_event_class, "getSource", "()I");
env->DeleteLocalRef(motion_event_class);
const jclass controller_interface_class = const jclass controller_interface_class =
env->FindClass("org/dolphinemu/dolphinemu/features/input/model/ControllerInterface"); env->FindClass("org/dolphinemu/dolphinemu/features/input/model/ControllerInterface");
@ -847,6 +847,7 @@ void Init()
"()Lorg/dolphinemu/dolphinemu/features/input/model/DolphinVibratorManager;"); "()Lorg/dolphinemu/dolphinemu/features/input/model/DolphinVibratorManager;");
s_controller_interface_vibrate = s_controller_interface_vibrate =
env->GetStaticMethodID(s_controller_interface_class, "vibrate", "(Landroid/os/Vibrator;)V"); env->GetStaticMethodID(s_controller_interface_class, "vibrate", "(Landroid/os/Vibrator;)V");
env->DeleteLocalRef(controller_interface_class);
const jclass sensor_event_listener_class = const jclass sensor_event_listener_class =
env->FindClass("org/dolphinemu/dolphinemu/features/input/model/DolphinSensorEventListener"); env->FindClass("org/dolphinemu/dolphinemu/features/input/model/DolphinSensorEventListener");
@ -864,6 +865,7 @@ void Init()
env->GetMethodID(s_sensor_event_listener_class, "getAxisNames", "()[Ljava/lang/String;"); env->GetMethodID(s_sensor_event_listener_class, "getAxisNames", "()[Ljava/lang/String;");
s_sensor_event_listener_get_negative_axes = s_sensor_event_listener_get_negative_axes =
env->GetMethodID(s_sensor_event_listener_class, "getNegativeAxes", "()[Z"); env->GetMethodID(s_sensor_event_listener_class, "getNegativeAxes", "()[Z");
env->DeleteLocalRef(sensor_event_listener_class);
const jclass dolphin_vibrator_manager_class = const jclass dolphin_vibrator_manager_class =
env->FindClass("org/dolphinemu/dolphinemu/features/input/model/DolphinVibratorManager"); env->FindClass("org/dolphinemu/dolphinemu/features/input/model/DolphinVibratorManager");
@ -873,6 +875,7 @@ void Init()
env->GetMethodID(s_dolphin_vibrator_manager_class, "getVibrator", "(I)Landroid/os/Vibrator;"); env->GetMethodID(s_dolphin_vibrator_manager_class, "getVibrator", "(I)Landroid/os/Vibrator;");
s_dolphin_vibrator_manager_get_vibrator_ids = s_dolphin_vibrator_manager_get_vibrator_ids =
env->GetMethodID(s_dolphin_vibrator_manager_class, "getVibratorIds", "()[I"); env->GetMethodID(s_dolphin_vibrator_manager_class, "getVibratorIds", "()[I");
env->DeleteLocalRef(dolphin_vibrator_manager_class);
jintArray keycodes_array = CreateKeyCodesArray(env); jintArray keycodes_array = CreateKeyCodesArray(env);
s_keycodes_array = reinterpret_cast<jintArray>(env->NewGlobalRef(keycodes_array)); s_keycodes_array = reinterpret_cast<jintArray>(env->NewGlobalRef(keycodes_array));
@ -990,9 +993,7 @@ Java_org_dolphinemu_dolphinemu_features_input_model_ControllerInterface_dispatch
return JNI_FALSE; return JNI_FALSE;
} }
const jobject input_device = env->CallObjectMethod(key_event, s_input_event_get_device); const jint device_id = env->CallIntMethod(key_event, s_input_event_get_device_id);
const jint device_id = env->CallIntMethod(input_device, s_input_device_get_id);
env->DeleteLocalRef(input_device);
const std::shared_ptr<ciface::Core::Device> device = FindDevice(device_id); const std::shared_ptr<ciface::Core::Device> device = FindDevice(device_id);
if (!device) if (!device)
return JNI_FALSE; return JNI_FALSE;
@ -1022,9 +1023,7 @@ JNIEXPORT jboolean JNICALL
Java_org_dolphinemu_dolphinemu_features_input_model_ControllerInterface_dispatchGenericMotionEvent( Java_org_dolphinemu_dolphinemu_features_input_model_ControllerInterface_dispatchGenericMotionEvent(
JNIEnv* env, jclass, jobject motion_event) JNIEnv* env, jclass, jobject motion_event)
{ {
const jobject input_device = env->CallObjectMethod(motion_event, s_input_event_get_device); const jint device_id = env->CallIntMethod(motion_event, s_input_event_get_device_id);
const jint device_id = env->CallIntMethod(input_device, s_input_device_get_id);
env->DeleteLocalRef(input_device);
const std::shared_ptr<ciface::Core::Device> device = FindDevice(device_id); const std::shared_ptr<ciface::Core::Device> device = FindDevice(device_id);
if (!device) if (!device)
return JNI_FALSE; return JNI_FALSE;