drgreen/scrcpy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initialize controller before keyboards

Browse Source 
The UHID keyboard initializer will need the controller.
This commit is contained in:
Romain Vimont 2024-02-24 22:33:58 +01:00
parent 558f20ac4a
commit 2b7310d6dc
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/scrcpy.c
View File

@ -542,6 +542,13 @@ scrcpy(struct scrcpy_options *options) {
struct sc_mouse_processor *mp = NULL; struct sc_mouse_processor *mp = NULL;
if (options->control) { if (options->control) {
if (!sc_controller_init(&s->controller, s->server.control_socket)) {
goto end;
}
controller_initialized = true;
controller = &s->controller;
#ifdef HAVE_USB #ifdef HAVE_USB
bool use_keyboard_aoa = bool use_keyboard_aoa =
options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_AOA; options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_AOA;
@ -663,18 +670,12 @@ aoa_hid_end:
mp = &s->mouse_sdk.mouse_processor; mp = &s->mouse_sdk.mouse_processor;
} }
if (!sc_controller_init(&s->controller, s->server.control_socket)) {
goto end;
}
controller_initialized = true;
sc_controller_set_acksync(&s->controller, acksync); sc_controller_set_acksync(&s->controller, acksync);
if (!sc_controller_start(&s->controller)) { if (!sc_controller_start(&s->controller)) {
goto end; goto end;
} }
controller_started = true; controller_started = true;
controller = &s->controller;
} }
// There is a controller if and only if control is enabled // There is a controller if and only if control is enabled