diff --git a/src/config.cpp b/src/config.cpp index 57f144f8..fbe651c5 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -571,7 +571,7 @@ namespace config { true, // high resolution scrolling true, // native pen/touch support false, // enable input only mode - true, // enable_rumble_messages_to_controllers + true, // forward_rumble }; sunshine_t sunshine { @@ -1287,7 +1287,7 @@ namespace config { bool_f(vars, "envvar_compatibility_mode", sunshine.envvar_compatibility_mode); bool_f(vars, "notify_pre_releases", sunshine.notify_pre_releases); bool_f(vars, "legacy_ordering", sunshine.legacy_ordering); - bool_f(vars, "enable_rumble_messages_to_controllers", input.enable_rumble_messages_to_controllers); + bool_f(vars, "forward_rumble", input.forward_rumble); int port = sunshine.port; int_between_f(vars, "port"s, port, {1024 + nvhttp::PORT_HTTPS, 65535 - rtsp_stream::RTSP_SETUP_PORT}); diff --git a/src/config.h b/src/config.h index 4fc3366b..8be2b42f 100644 --- a/src/config.h +++ b/src/config.h @@ -211,7 +211,7 @@ namespace config { bool native_pen_touch; bool enable_input_only_mode; - bool enable_rumble_messages_to_controllers; + bool forward_rumble; }; namespace flag { diff --git a/src/platform/windows/input.cpp b/src/platform/windows/input.cpp index daf218d9..9d182c7f 100644 --- a/src/platform/windows/input.cpp +++ b/src/platform/windows/input.cpp @@ -327,8 +327,8 @@ namespace platf { * @param smallMotor The small motor. */ void rumble(target_t::pointer target, std::uint8_t largeMotor, std::uint8_t smallMotor) { - // config::input.enable_rumble_messages_to_controllers - Default is true so ignore rumble messages when false - if( config::input.enable_rumble_messages_to_controllers == false ) { + // config::input.forward_rumble - Default is true so ignore rumble messages when false + if( config::input.forward_rumble == false ) { // Do nothing; just return return; } diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html index 263406ee..3ebad8ff 100644 --- a/src_assets/common/assets/web/config.html +++ b/src_assets/common/assets/web/config.html @@ -176,7 +176,7 @@ "high_resolution_scrolling": "enabled", "native_pen_touch": "enabled", "enable_input_only_mode": "disabled", - "enable_rumble_messages_to_controllers": "enabled", + "forward_rumble": "enabled", "keybindings": "[0x10,0xA0,0x11,0xA2,0x12,0xA4]", // todo: add this to UI }, }, diff --git a/src_assets/common/assets/web/configs/tabs/Inputs.vue b/src_assets/common/assets/web/configs/tabs/Inputs.vue index e8487cbe..f92baecb 100644 --- a/src_assets/common/assets/web/configs/tabs/Inputs.vue +++ b/src_assets/common/assets/web/configs/tabs/Inputs.vue @@ -182,9 +182,9 @@ const config = ref(props.config)