From efb531943d87c06bc6c773f6d28ebd21f4aa0488 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Sun, 2 May 2021 15:00:06 +0200
Subject: [PATCH] reorder server server_params

---
 app/src/server.h | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/src/server.h b/app/src/server.h
index 15306e4f..38e0024d 100644
--- a/app/src/server.h
+++ b/app/src/server.h
@@ -13,24 +13,6 @@
 #include "util/net.h"
 #include "util/thread.h"
 
-struct server {
-    char *serial;
-    process_t process;
-    sc_thread wait_server_thread;
-    atomic_flag server_socket_closed;
-
-    sc_mutex mutex;
-    sc_cond process_terminated_cond;
-    bool process_terminated;
-
-    socket_t server_socket; // only used if !tunnel_forward
-    socket_t video_socket;
-    socket_t 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 {
     enum sc_log_level log_level;
     const char *crop;
@@ -49,6 +31,24 @@ struct server_params {
     bool power_off_on_close;
 };
 
+struct server {
+    char *serial;
+    process_t process;
+    sc_thread wait_server_thread;
+    atomic_flag server_socket_closed;
+
+    sc_mutex mutex;
+    sc_cond process_terminated_cond;
+    bool process_terminated;
+
+    socket_t server_socket; // only used if !tunnel_forward
+    socket_t video_socket;
+    socket_t 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);