diff --git a/app/meson.build b/app/meson.build index 60888bb3..c26332e0 100644 --- a/app/meson.build +++ b/app/meson.build @@ -72,8 +72,8 @@ if v4l2_support src += [ 'src/v4l2_sink.c' ] endif -aoa_hid_support = host_machine.system() == 'linux' -if aoa_hid_support +usb_support = host_machine.system() == 'linux' +if usb_support src += [ 'src/usb/aoa_hid.c', 'src/usb/hid_keyboard.c', @@ -99,7 +99,7 @@ if not crossbuild_windows dependencies += dependency('libavdevice') endif - if aoa_hid_support + if usb_support dependencies += dependency('libusb-1.0') endif @@ -193,7 +193,7 @@ conf.set('SERVER_DEBUGGER_METHOD_NEW', get_option('server_debugger_method') == ' conf.set('HAVE_V4L2', v4l2_support) # enable HID over AOA support (linux only) -conf.set('HAVE_AOA_HID', aoa_hid_support) +conf.set('HAVE_USB', usb_support) configure_file(configuration: conf, output: 'config.h') diff --git a/app/src/cli.c b/app/src/cli.c index 60492730..34c3103a 100644 --- a/app/src/cli.c +++ b/app/src/cli.c @@ -1318,7 +1318,7 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[], args->help = true; break; case 'K': -#ifdef HAVE_AOA_HID +#ifdef HAVE_USB opts->keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_HID; break; #else @@ -1337,7 +1337,7 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[], } break; case 'M': -#ifdef HAVE_AOA_HID +#ifdef HAVE_USB opts->mouse_input_mode = SC_MOUSE_INPUT_MODE_HID; break; #else diff --git a/app/src/scrcpy.c b/app/src/scrcpy.c index c1e20edb..9321cf47 100644 --- a/app/src/scrcpy.c +++ b/app/src/scrcpy.c @@ -23,7 +23,7 @@ #include "screen.h" #include "server.h" #include "stream.h" -#ifdef HAVE_AOA_HID +#ifdef HAVE_USB # include "usb/aoa_hid.h" # include "usb/hid_keyboard.h" # include "usb/hid_mouse.h" @@ -46,20 +46,20 @@ struct scrcpy { #endif struct sc_controller controller; struct sc_file_pusher file_pusher; -#ifdef HAVE_AOA_HID +#ifdef HAVE_USB struct sc_aoa aoa; // sequence/ack helper to synchronize clipboard and Ctrl+v via HID struct sc_acksync acksync; #endif union { struct sc_keyboard_inject keyboard_inject; -#ifdef HAVE_AOA_HID +#ifdef HAVE_USB struct sc_hid_keyboard keyboard_hid; #endif }; union { struct sc_mouse_inject mouse_inject; -#ifdef HAVE_AOA_HID +#ifdef HAVE_USB struct sc_hid_mouse mouse_hid; #endif }; @@ -284,7 +284,7 @@ scrcpy(struct scrcpy_options *options) { bool v4l2_sink_initialized = false; #endif bool stream_started = false; -#ifdef HAVE_AOA_HID +#ifdef HAVE_USB bool aoa_hid_initialized = false; bool hid_keyboard_initialized = false; bool hid_mouse_initialized = false; @@ -411,7 +411,7 @@ scrcpy(struct scrcpy_options *options) { struct sc_mouse_processor *mp = NULL; if (options->control) { -#ifdef HAVE_AOA_HID +#ifdef HAVE_USB bool use_hid_keyboard = options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_HID; bool use_hid_mouse = @@ -594,7 +594,7 @@ aoa_hid_end: end: // The stream is not stopped explicitly, because it will stop by itself on // end-of-stream -#ifdef HAVE_AOA_HID +#ifdef HAVE_USB if (aoa_hid_initialized) { if (hid_keyboard_initialized) { sc_hid_keyboard_destroy(&s->keyboard_hid); @@ -635,7 +635,7 @@ end: } #endif -#ifdef HAVE_AOA_HID +#ifdef HAVE_USB if (aoa_hid_initialized) { sc_aoa_join(&s->aoa); sc_aoa_destroy(&s->aoa);