Display and control your Android device
Extract sc_push_event()
Romain Vimonte9b32d8a52b4
diff --git a/app/meson.build b/app/meson.buildindex b0a6aadb..fc6b85e2 100644--- a/app/meson.build+++ b/app/meson.build@@ -15,6 +15,7 @@ src = ['src/demuxer.c','src/device_msg.c','src/display.c',+ 'src/events.c','src/icon.c','src/file_pusher.c','src/fps_counter.c',diff --git a/app/src/events.c b/app/src/events.cnew file mode 100644index 00000000..4e256be2--- /dev/null+++ b/app/src/events.c@@ -0,0 +1,19 @@+#include "events.h"++#include "util/log.h"++bool+sc_push_event_impl(uint32_t type, const char *name) {+ SDL_Event event;+ event.type = type;+ int ret = SDL_PushEvent(&event);+ // ret < 0: error (queue full)+ // ret == 0: event was filtered+ // ret == 1: success+ if (ret != 1) {+ LOGE("Could not post %s event: %s", name, SDL_GetError());+ return false;+ }++ return true;+}diff --git a/app/src/events.h b/app/src/events.hindex f1aa22aa..d803fb68 100644--- a/app/src/events.h+++ b/app/src/events.h@@ -3,6 +3,8 @@#include "common.h"+#include <stdbool.h>+#include <stdint.h>#include <SDL_events.h>enum {@@ -18,4 +20,9 @@ enum {SC_EVENT_CONTROLLER_ERROR,};+bool+sc_push_event_impl(uint32_t type, const char *name);++#define sc_push_event(TYPE) sc_push_event_impl(TYPE, # TYPE)+#endifdiff --git a/app/src/scrcpy.c b/app/src/scrcpy.cindex aafe108c..625a53a9 100644--- a/app/src/scrcpy.c+++ b/app/src/scrcpy.c@@ -82,22 +82,10 @@ struct scrcpy {struct sc_timeout timeout;};-static inline void-push_event(uint32_t type, const char *name) {- SDL_Event event;- event.type = type;- int ret = SDL_PushEvent(&event);- if (ret < 0) {- LOGE("Could not post %s event: %s", name, SDL_GetError());- // What could we do?- }-}-#define PUSH_EVENT(TYPE) push_event(TYPE, # TYPE)-#ifdef _WIN32static BOOL WINAPI windows_ctrl_handler(DWORD ctrl_type) {if (ctrl_type == CTRL_C_EVENT) {- PUSH_EVENT(SDL_QUIT);+ sc_push_event(SDL_QUIT);return TRUE;}return FALSE;@@ -230,7 +218,7 @@ sc_recorder_on_ended(struct sc_recorder *recorder, bool success,(void) userdata;if (!success) {- PUSH_EVENT(SC_EVENT_RECORDER_ERROR);+ sc_push_event(SC_EVENT_RECORDER_ERROR);}}@@ -244,9 +232,9 @@ sc_video_demuxer_on_ended(struct sc_demuxer *demuxer,assert(status != SC_DEMUXER_STATUS_DISABLED);if (status == SC_DEMUXER_STATUS_EOS) {- PUSH_EVENT(SC_EVENT_DEVICE_DISCONNECTED);+ sc_push_event(SC_EVENT_DEVICE_DISCONNECTED);} else {- PUSH_EVENT(SC_EVENT_DEMUXER_ERROR);+ sc_push_event(SC_EVENT_DEMUXER_ERROR);}}@@ -260,11 +248,11 @@ sc_audio_demuxer_on_ended(struct sc_demuxer *demuxer,// Contrary to the video demuxer, keep mirroring if only the audio fails// (unless --require-audio is set).if (status == SC_DEMUXER_STATUS_EOS) {- PUSH_EVENT(SC_EVENT_DEVICE_DISCONNECTED);+ sc_push_event(SC_EVENT_DEVICE_DISCONNECTED);} else if (status == SC_DEMUXER_STATUS_ERROR|| (status == SC_DEMUXER_STATUS_DISABLED&& options->require_audio)) {- PUSH_EVENT(SC_EVENT_DEMUXER_ERROR);+ sc_push_event(SC_EVENT_DEMUXER_ERROR);}}@@ -277,9 +265,9 @@ sc_controller_on_ended(struct sc_controller *controller, bool error,(void) userdata;if (error) {- PUSH_EVENT(SC_EVENT_CONTROLLER_ERROR);+ sc_push_event(SC_EVENT_CONTROLLER_ERROR);} else {- PUSH_EVENT(SC_EVENT_DEVICE_DISCONNECTED);+ sc_push_event(SC_EVENT_DEVICE_DISCONNECTED);}}@@ -288,7 +276,7 @@ sc_server_on_connection_failed(struct sc_server *server, void *userdata) {(void) server;(void) userdata;- PUSH_EVENT(SC_EVENT_SERVER_CONNECTION_FAILED);+ sc_push_event(SC_EVENT_SERVER_CONNECTION_FAILED);}static void@@ -296,7 +284,7 @@ sc_server_on_connected(struct sc_server *server, void *userdata) {(void) server;(void) userdata;- PUSH_EVENT(SC_EVENT_SERVER_CONNECTED);+ sc_push_event(SC_EVENT_SERVER_CONNECTED);}static void@@ -314,7 +302,7 @@ sc_timeout_on_timeout(struct sc_timeout *timeout, void *userdata) {(void) timeout;(void) userdata;- PUSH_EVENT(SC_EVENT_TIME_LIMIT_REACHED);+ sc_push_event(SC_EVENT_TIME_LIMIT_REACHED);}// Generate a scrcpy id to differentiate multiple running scrcpy instancesdiff --git a/app/src/screen.c b/app/src/screen.cindex dc61e835..42be554a 100644--- a/app/src/screen.c+++ b/app/src/screen.c@@ -312,14 +312,9 @@ sc_screen_frame_sink_open(struct sc_frame_sink *sink,screen->frame_size.width = ctx->width;screen->frame_size.height = ctx->height;- static SDL_Event event = {- .type = SC_EVENT_SCREEN_INIT_SIZE,- };-// Post the event on the UI thread (the texture must be created from there)- int ret = SDL_PushEvent(&event);- if (ret < 0) {- LOGW("Could not post init size event: %s", SDL_GetError());+ bool ok = sc_push_event(SC_EVENT_SCREEN_INIT_SIZE);+ if (!ok) {return false;}@@ -358,14 +353,9 @@ sc_screen_frame_sink_push(struct sc_frame_sink *sink, const AVFrame *frame) {// The SC_EVENT_NEW_FRAME triggered for the previous frame will consume// this new frame instead} else {- static SDL_Event new_frame_event = {- .type = SC_EVENT_NEW_FRAME,- };-// Post the event on the UI thread- int ret = SDL_PushEvent(&new_frame_event);- if (ret < 0) {- LOGW("Could not post new frame event: %s", SDL_GetError());+ bool ok = sc_push_event(SC_EVENT_NEW_FRAME);+ if (!ok) {return false;}}diff --git a/app/src/usb/scrcpy_otg.c b/app/src/usb/scrcpy_otg.cindex c1d38da3..715f690a 100644--- a/app/src/usb/scrcpy_otg.c+++ b/app/src/usb/scrcpy_otg.c@@ -21,12 +21,7 @@ sc_usb_on_disconnected(struct sc_usb *usb, void *userdata) {(void) usb;(void) userdata;- SDL_Event event;- event.type = SC_EVENT_USB_DEVICE_DISCONNECTED;- int ret = SDL_PushEvent(&event);- if (ret < 0) {- LOGE("Could not post USB disconnection event: %s", SDL_GetError());- }+ sc_push_event(SC_EVENT_USB_DEVICE_DISCONNECTED);}static enum scrcpy_exit_code