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

Merge branch 'master' into cuda

Browse Source
This commit is contained in:
loki-47-6F-64
2021-09-14 15:09:21 +02:00
parent f5db0e438b 69eba9c493
commit 7563a0fa1f
5 changed files with 63 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sunshine/platform/common.h
+1 -1
View File
@@ -290,7 +290,7 @@ void scroll(input_t &input, int distance);
void keyboard(input_t &input, uint16_t modcode, bool release);
void gamepad(input_t &input, int nr, const gamepad_state_t &gamepad_state);
int alloc_gamepad(input_t &input, int nr, rumble_queue_t &&rumble_queue);
int alloc_gamepad(input_t &input, int nr, rumble_queue_t rumble_queue);
void free_gamepad(input_t &input, int nr);
#define SERVICE_NAME "Sunshine"
sunshine/platform/linux/input.cpp
+4 -3
View File
@@ -51,8 +51,8 @@ struct keycode_t {
constexpr auto UNKNOWN = 0;
static constexpr std::array<keycode_t, 0xDF> init_keycodes() {
std::array<keycode_t, 0xDF> keycodes {};
static constexpr std::array<keycode_t, 0xE3> init_keycodes() {
std::array<keycode_t, 0xE3> keycodes {};
#define __CONVERT(wincode, linuxcode, scancode) \
static_assert(wincode < keycodes.size(), "Keycode doesn't fit into keycode array"); \
@@ -182,6 +182,7 @@ static constexpr std::array<keycode_t, 0xDF> init_keycodes() {
__CONVERT(0xDC /* VKEY_OEM_5 */, KEY_BACKSLASH, 0x70031);
__CONVERT(0xDD /* VKEY_OEM_6 */, KEY_RIGHTBRACE, 0x70030);
__CONVERT(0xDE /* VKEY_OEM_7 */, KEY_APOSTROPHE, 0x70034);
__CONVERT(0xE2 /* VKEY_NON_US_BACKSLASH */, KEY_102ND, 0x70064);
#undef __CONVERT
return keycodes;
@@ -985,7 +986,7 @@ void keyboard(input_t &input, uint16_t modcode, bool release) {
keycode.pressed = 1;
}
int alloc_gamepad(input_t &input, int nr, rumble_queue_t &&rumble_queue) {
int alloc_gamepad(input_t &input, int nr, rumble_queue_t rumble_queue) {
return ((input_raw_t *)input.get())->alloc_gamepad(nr, std::move(rumble_queue));
}
sunshine/platform/windows/input.cpp
+1 -1
View File
@@ -326,7 +326,7 @@ void keyboard(input_t &input, uint16_t modcode, bool release) {
send_input(i);
}
int alloc_gamepad(input_t &input, int nr, rumble_queue_t &&rumble_queue) {
int alloc_gamepad(input_t &input, int nr, rumble_queue_t rumble_queue) {
if(!input) {
return 0;
}