diff options
Diffstat (limited to 'Source/Android/jni/Input/MappingCommon.cpp')
| -rw-r--r-- | Source/Android/jni/Input/MappingCommon.cpp | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/Source/Android/jni/Input/MappingCommon.cpp b/Source/Android/jni/Input/MappingCommon.cpp index 1cc55df2ae..2017c892db 100644 --- a/Source/Android/jni/Input/MappingCommon.cpp +++ b/Source/Android/jni/Input/MappingCommon.cpp @@ -17,43 +17,10 @@ #include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/MappingCommon.h" #include "jni/AndroidCommon/AndroidCommon.h" -#include "jni/Input/EmulatedController.h" - -namespace -{ -constexpr auto INPUT_DETECT_INITIAL_TIME = std::chrono::seconds(3); -constexpr auto INPUT_DETECT_CONFIRMATION_TIME = std::chrono::milliseconds(0); -constexpr auto INPUT_DETECT_MAXIMUM_TIME = std::chrono::seconds(5); -} // namespace extern "C" { JNIEXPORT jstring JNICALL -Java_org_dolphinemu_dolphinemu_features_input_model_MappingCommon_detectInput( - JNIEnv* env, jclass, jobject j_emulated_controller, jboolean all_devices) -{ - ControllerEmu::EmulatedController* emulated_controller = - EmulatedControllerFromJava(env, j_emulated_controller); - - const ciface::Core::DeviceQualifier default_device = emulated_controller->GetDefaultDevice(); - - std::vector<std::string> device_strings; - if (all_devices) - device_strings = g_controller_interface.GetAllDeviceStrings(); - else - device_strings = {default_device.ToString()}; - - auto detections = - g_controller_interface.DetectInput(device_strings, INPUT_DETECT_INITIAL_TIME, - INPUT_DETECT_CONFIRMATION_TIME, INPUT_DETECT_MAXIMUM_TIME); - - ciface::MappingCommon::RemoveSpuriousTriggerCombinations(&detections); - - return ToJString(env, ciface::MappingCommon::BuildExpression(detections, default_device, - 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) { |
