From 9fa4d1cd4a7a54d19593aa460eacbd34a665216b Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Wed, 27 Oct 2021 23:20:47 +0200
Subject: [PATCH] Reorder server and server_params

This will allow to define a server_params field in server.
---
 app/src/server.h | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/server.h b/app/src/server.h
index c06b3562..0506bf10 100644
--- a/app/src/server.h
+++ b/app/src/server.h
@@ -20,21 +20,6 @@ struct server_info {
     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 {
     const char *serial;
     enum sc_log_level log_level;
@@ -54,6 +39,21 @@ struct server_params {
     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
 bool
 server_init(struct server *server);