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

Refactor gamepad device creation

Browse Source
This commit is contained in:
loki
2020-01-25 20:46:14 +01:00
parent 8b7c833cd4
commit 1d9ccb211e
4 changed files with 156 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sunshine/platform/windows.cpp
View File

@@ -35,6 +35,7 @@ public:
return -1;
}
x360s.resize(MAX_GAMEPADS);
for(auto &x360 : x360s) {
x360.reset(vigem_target_x360_alloc());
@@ -262,7 +263,7 @@ void keyboard(input_t &input, uint16_t modcode, bool release) {
}
}
void gamepad(input_t &input, int controller, const gamepad_state_t &gamepad_state) {
void gamepad(input_t &input, int nr, const gamepad_state_t &gamepad_state) {
// If there is no gamepad support
if(!input) {
return;
@@ -270,13 +271,8 @@ void gamepad(input_t &input, int controller, const gamepad_state_t &gamepad_stat
auto vigem = (vigem_t*)input.get();
if(controller < 0 && controller >= vigem->x360s.size()) {
BOOST_LOG(warning) << "Controller number out of range: ["sv << controller << " > "sv << vigem->x360s.size() << ']';
return;
}
auto &xusb = *(PXUSB_REPORT)&gamepad_state;
auto &x360 = vigem->x360s[controller];
auto &x360 = vigem->x360s[nr];
auto status = vigem_target_x360_update(vigem->client.get(), x360.get(), xusb);
if(!VIGEM_SUCCESS(status)) {