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

fix(win/input): fix false warnings about missing ViGEmBus (#3097)

Browse Source
This commit is contained in:
Cameron Gutman
2024-08-26 09:41:17 -05:00
committed by GitHub
parent 45265fb103
commit 3976b63ee8
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/platform/common.h
View File

@@ -860,6 +860,8 @@ namespace platf {
/** /**
* @brief Gets the supported gamepads for this platform backend. * @brief Gets the supported gamepads for this platform backend.
* @details This may be called prior to `platf::input()`!
* @param input Pointer to the platform's `input_t` or `nullptr`.
* @return Vector of gamepad options and status. * @return Vector of gamepad options and status.
*/ */
std::vector<supported_gamepad_t> & std::vector<supported_gamepad_t> &

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

@@ -1728,15 +1728,18 @@ namespace platf {
std::vector<supported_gamepad_t> & std::vector<supported_gamepad_t> &
supported_gamepads(input_t *input) { supported_gamepads(input_t *input) {
bool enabled; if (!input) {
if (input) { static std::vector gps {
auto vigem = ((input_raw_t *) input)->vigem; supported_gamepad_t { "auto", true, "" },
enabled = vigem != nullptr; supported_gamepad_t { "x360", false, "" },
} supported_gamepad_t { "ds4", false, "" },
else { };
enabled = false;
return gps;
} }
auto vigem = ((input_raw_t *) input)->vigem;
auto enabled = vigem != nullptr;
auto reason = enabled ? "" : "gamepads.vigem-not-available"; auto reason = enabled ? "" : "gamepads.vigem-not-available";
// ds4 == ps4 // ds4 == ps4