mirrors/scrcpy
1
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-04-20 03:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

apkinstaller integration into scrcpy

Browse source
This commit is contained in:
Adonis Najimi 2018-05-01 13:25:24 +02:00
parent 0f9f3a3a12
commit 243a02580c
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/scrcpy.c
View file

@ -22,12 +22,14 @@
#include "screen.h"
#include "server.h"
#include "tinyxpm.h"
#include "apkinstaller.h"
static struct server server = SERVER_INITIALIZER;
static struct screen screen = SCREEN_INITIALIZER;
static struct frames frames;
static struct decoder decoder;
static struct controller controller;
static struct installer installer;
static struct input_manager input_manager = {
.controller = &controller,
@ -103,7 +105,8 @@ static void event_loop(void) {
input_manager_process_mouse_button(&input_manager, &event.button);
break;
case SDL_DROPFILE:
server_install(&server, event.drop.file);
// TODO(adopi) init here
installer_push_apk(&installer, event.drop.file);
break;
}
}
@ -170,6 +173,12 @@ SDL_bool scrcpy(const char *serial, Uint16 local_port, Uint16 max_size, Uint32 b
goto finally_destroy_controller;
}
// TODO(adopi) init the installer when we really want to use it
if (!installer_init(&installer, server.serial)) {
ret = SDL_FALSE;
goto finally_destroy_installer;
}
if (!screen_init_rendering(&screen, device_name, frame_size)) {
ret = SDL_FALSE;
goto finally_stop_and_join_controller;
@ -184,6 +193,11 @@ finally_stop_and_join_controller:
controller_join(&controller);
finally_destroy_controller:
controller_destroy(&controller);
finally_stop_and_join_installer:
installer_stop(&installer);
installer_join(&installer);
finally_destroy_installer:
installer_destroy(&installer);
finally_stop_decoder:
decoder_stop(&decoder);
// stop the server before decoder_join() to wake up the decoder

5
app/src/server.c
View file

@ -145,11 +145,6 @@ void server_init(struct server *server) {
*server = (struct server) SERVER_INITIALIZER;
}
SDL_bool server_install(struct server *server, const char* apk_path) {
process_t process = adb_install(server->serial, apk_path);
return process_check_success(process, "adb install");
}
SDL_bool server_start(struct server *server, const char *serial, Uint16 local_port,
Uint16 max_size, Uint32 bit_rate) {
server->local_port = local_port;

3
app/src/server.h
View file

@ -33,9 +33,6 @@ void server_init(struct server *server);
SDL_bool server_start(struct server *server, const char *serial, Uint16 local_port,
Uint16 max_size, Uint32 bit_rate);
// install an apk file located to apk_path
SDL_bool server_install(struct server *server, const char* apk_path);
// block until the communication with the server is established
socket_t server_connect_to(struct server *server);