summaryrefslogtreecommitdiff
path: root/Source/Android/jni/Input/MappingCommon.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2022-12-27 16:29:01 +0100
committerJosJuice <josjuice@gmail.com>2023-03-07 17:39:30 +0100
commitc2779aef060137d9062cfd29babb3c43fc5fa2b5 (patch)
tree421bbf1ba198ec00b5e7dfe9118da77e079d89c1 /Source/Android/jni/Input/MappingCommon.cpp
parent42943672bbbed6c18aa2bc85c41102a0616547f7 (diff)
Android: Add the advanced input mapping dialog
It's missing a lot of features from the PC version for now, like buttons for inserting functions and the ability to see what the expression evaluates to. I mostly just wanted to get something in place so you can set up rumble. Co-authored-by: Charles Lombardo <clombardo169@gmail.com>
Diffstat (limited to 'Source/Android/jni/Input/MappingCommon.cpp')
-rw-r--r--Source/Android/jni/Input/MappingCommon.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/Source/Android/jni/Input/MappingCommon.cpp b/Source/Android/jni/Input/MappingCommon.cpp
index 4e5d88ccf6..1cc55df2ae 100644
--- a/Source/Android/jni/Input/MappingCommon.cpp
+++ b/Source/Android/jni/Input/MappingCommon.cpp
@@ -53,6 +53,19 @@ Java_org_dolphinemu_dolphinemu_features_input_model_MappingCommon_detectInput(
ciface::MappingCommon::Quote::On));
}
+JNIEXPORT jstring JNICALL
+Java_org_dolphinemu_dolphinemu_features_input_model_MappingCommon_getExpressionForControl(
+ JNIEnv* env, jclass, jstring j_control, jstring j_device, jstring j_default_device)
+{
+ ciface::Core::DeviceQualifier device_qualifier, default_device_qualifier;
+ device_qualifier.FromString(GetJString(env, j_device));
+ default_device_qualifier.FromString(GetJString(env, j_default_device));
+
+ return ToJString(env, ciface::MappingCommon::GetExpressionForControl(GetJString(env, j_control),
+ device_qualifier,
+ default_device_qualifier));
+}
+
JNIEXPORT void JNICALL
Java_org_dolphinemu_dolphinemu_features_input_model_MappingCommon_save(JNIEnv* env, jclass)
{