From 0dd8bbbbbb91f701f284561f244fa4e6f29b5f61 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Mon, 18 Apr 2022 17:17:48 +0200 Subject: Android: Add extension selection --- Source/Android/jni/Input/ControlGroup.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'Source/Android/jni/Input/ControlGroup.cpp') diff --git a/Source/Android/jni/Input/ControlGroup.cpp b/Source/Android/jni/Input/ControlGroup.cpp index 01405a0e8b..0b69145b36 100644 --- a/Source/Android/jni/Input/ControlGroup.cpp +++ b/Source/Android/jni/Input/ControlGroup.cpp @@ -6,6 +6,7 @@ #include #include "Common/MsgHandler.h" +#include "InputCommon/ControllerEmu/ControlGroup/Attachments.h" #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" #include "jni/AndroidCommon/AndroidCommon.h" #include "jni/AndroidCommon/IDCache.h" @@ -36,6 +37,13 @@ Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_ControlGroup_g return ToJString(env, Common::GetStringT(GetPointer(env, obj)->ui_name.c_str())); } +JNIEXPORT jint JNICALL +Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_ControlGroup_getGroupType( + JNIEnv* env, jobject obj) +{ + return static_cast(GetPointer(env, obj)->type); +} + JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_ControlGroup_getControlCount( JNIEnv* env, jobject obj) @@ -63,4 +71,12 @@ Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_ControlGroup_g { return NumericSettingToJava(env, GetPointer(env, obj)->numeric_settings[i].get()); } + +JNIEXPORT jobject JNICALL +Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_ControlGroup_getAttachmentSetting( + JNIEnv* env, jobject obj) +{ + auto* group = reinterpret_cast(GetPointer(env, obj)); + return NumericSettingToJava(env, &group->GetSelectionSetting()); +} } -- cgit v1.2.3