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

Move file_handler initialization

Browse Source 
This will allow to (properly) reference the controller from the
file_handler initializer.
This commit is contained in:
Romain Vimont
2021-06-13 22:32:36 +02:00
parent af228706f1
commit 310f5721d9
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/scrcpy.c
View File

@@ -297,14 +297,6 @@ scrcpy(const struct scrcpy_options *options) {
goto end; goto end;
} }
if (options->display && options->control) {
if (!file_handler_init(&s->file_handler, s->server.serial,
options->push_target)) {
goto end;
}
file_handler_initialized = true;
}
struct decoder *dec = NULL; struct decoder *dec = NULL;
bool needs_decoder = options->display; bool needs_decoder = options->display;
#ifdef HAVE_V4L2 #ifdef HAVE_V4L2
@@ -353,6 +345,12 @@ scrcpy(const struct scrcpy_options *options) {
goto end; goto end;
} }
controller_started = true; controller_started = true;
if (!file_handler_init(&s->file_handler, s->server.serial,
options->push_target)) {
goto end;
}
file_handler_initialized = true;
} }
const char *window_title = const char *window_title =