Reorder server and server_params

This will allow to define a server_params field in server.
This commit is contained in:
Romain Vimont 2021-10-27 23:20:47 +02:00
parent 0bfa75a48b
commit 9fa4d1cd4a

View file

@ -20,21 +20,6 @@ struct server_info {
struct sc_size frame_size; struct sc_size frame_size;
}; };
struct server {
char *serial;
sc_pid process;
// alive only between start() and stop()
struct sc_process_observer observer;
sc_socket server_socket; // only used if !tunnel_forward
sc_socket video_socket;
sc_socket control_socket;
uint16_t local_port; // selected from port_range
bool tunnel_enabled;
bool tunnel_forward; // use "adb forward" instead of "adb reverse"
};
struct server_params { struct server_params {
const char *serial; const char *serial;
enum sc_log_level log_level; enum sc_log_level log_level;
@ -54,6 +39,21 @@ struct server_params {
bool power_off_on_close; bool power_off_on_close;
}; };
struct server {
char *serial;
sc_pid process;
// alive only between start() and stop()
struct sc_process_observer observer;
sc_socket server_socket; // only used if !tunnel_forward
sc_socket video_socket;
sc_socket control_socket;
uint16_t local_port; // selected from port_range
bool tunnel_enabled;
bool tunnel_forward; // use "adb forward" instead of "adb reverse"
};
// init default values // init default values
bool bool
server_init(struct server *server); server_init(struct server *server);