izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change logic to enable/disable rumble functionality

Browse Source 
Change logic to enable/disable rumble functionality instead of enable block rumble functionality
This commit is contained in:
thesystemcoder168
2025-07-03 05:54:30 -07:00
parent 54cb7eceba
commit 576fc4bcb8
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/config.cpp
View File

@@ -572,7 +572,7 @@ namespace config {
true, // high resolution scrolling
true, // native pen/touch support
false, // enable input only mode
false, // enable_block_rumble_messages_to_controllers
true, // enable_rumble_messages_to_controllers
};
sunshine_t sunshine {
@@ -1289,7 +1289,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_block_rumble_messages_to_controllers", input.enable_block_rumble_messages_to_controllers);
bool_f(vars, "enable_rumble_messages_to_controllers", input.enable_rumble_messages_to_controllers);
int port = sunshine.port;
int_between_f(vars, "port"s, port, {1024 + nvhttp::PORT_HTTPS, 65535 - rtsp_stream::RTSP_SETUP_PORT});

2
src/config.h
View File

@@ -212,7 +212,7 @@ namespace config {
bool native_pen_touch;
bool enable_input_only_mode;
bool enable_block_rumble_messages_to_controllers;
bool enable_rumble_messages_to_controllers;
};
namespace flag {

4
src/platform/windows/input.cpp
View File

@@ -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_block_rumble_messages_to_controllers - Default is false so ignore rumble messages when true
if( config::input.enable_block_rumble_messages_to_controllers == true ) {
// 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 ) {
// Do nothing; just return
return;
}

2
src_assets/common/assets/web/config.html
View File

@@ -176,7 +176,7 @@
"high_resolution_scrolling": "enabled",
"native_pen_touch": "enabled",
"enable_input_only_mode": "disabled",
"enable_block_rumble_messages_to_controllers": "disabled",
"enable_rumble_messages_to_controllers": "enabled",
"keybindings": "[0x10,0xA0,0x11,0xA2,0x12,0xA4]", // todo: add this to UI
},
},

8
src_assets/common/assets/web/configs/tabs/Inputs.vue
View File

@@ -178,14 +178,14 @@ const config = ref(props.config)
default="false"
></Checkbox>
<!-- Enable Block Rumble Messages to Controllers -->
<!-- Enable Rumble Messages to Controllers -->
<hr>
<Checkbox v-if="platform === 'windows'"
class="mb-3"
id="enable_block_rumble_messages_to_controllers"
id="enable_rumble_messages_to_controllers"
locale-prefix="config"
v-model="config.enable_block_rumble_messages_to_controllers"
default="false"
v-model="config.enable_rumble_messages_to_controllers"
default="true"
></Checkbox>
</div>

4
src_assets/common/assets/web/public/assets/locale/en.json
View File

@@ -255,8 +255,8 @@
"enable_discovery_desc": "When disabled, you'll need to manually enter host IP on the client to pair.",
"enable_input_only_mode": "Enable Input Only Mode",
"enable_input_only_mode_desc": "Add an Input Only app entry. When enabled, the app list will only show the current running app and the Input Only entry when streaming. The Input Only entry will not receive any image or audio. Useful for operating the desktop on TV or connecting peripherals which the TV doesn't support with a phone.",
"enable_block_rumble_messages_to_controllers": "Block Rumble Messages to Controllers",
"enable_block_rumble_messages_to_controllers_desc": "Block Rumble Messages to Controllers",
"enable_rumble_messages_to_controllers": "Enable Rumble Messages to Controllers",
"enable_rumble_messages_to_controllers_desc": "Enable Rumble Messages to Controllers",
"enable_pairing": "Enable Pairing",
"enable_pairing_desc": "Enable pairing for the Moonlight client. This allows the client to authenticate with the host and establish a secure connection.",
"encoder": "Force a Specific Encoder",