Display and control your Android device
Group common includes into common.h
Romain Vimont59feb2a15c2e
diff --git a/app/src/adb.c b/app/src/adb.cindex 339c854d..086db174 100644--- a/app/src/adb.c+++ b/app/src/adb.c@@ -5,8 +5,6 @@#include <stdlib.h>#include <string.h>-#include "config.h"-#include "common.h"#include "util/log.h"#include "util/str_util.h"diff --git a/app/src/adb.h b/app/src/adb.hindex 52cdf823..453e3019 100644--- a/app/src/adb.h+++ b/app/src/adb.h@@ -4,7 +4,7 @@#include <stdbool.h>#include <inttypes.h>-#include "config.h"+#include "common.h"#include "util/process.h"diff --git a/app/src/cli.c b/app/src/cli.cindex 694282a2..fbdef07f 100644--- a/app/src/cli.c+++ b/app/src/cli.c@@ -6,7 +6,6 @@#include <stdio.h>#include <unistd.h>-#include "config.h"#include "scrcpy.h"#include "util/log.h"#include "util/str_util.h"diff --git a/app/src/cli.h b/app/src/cli.hindex 73dfe228..22bded79 100644--- a/app/src/cli.h+++ b/app/src/cli.h@@ -3,7 +3,7 @@#include <stdbool.h>-#include "config.h"+#include "common.h"#include "scrcpy.h"struct scrcpy_cli_args {diff --git a/app/src/common.h b/app/src/common.hindex 3f517d5b..27c8d2fb 100644--- a/app/src/common.h+++ b/app/src/common.h@@ -2,6 +2,7 @@#define COMMON_H#include "config.h"+#include "compat.h"#define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0]))#define MIN(X,Y) (X) < (Y) ? (X) : (Y)diff --git a/app/src/control_msg.c b/app/src/control_msg.cindex 27c7903d..77e534cd 100644--- a/app/src/control_msg.c+++ b/app/src/control_msg.c@@ -3,7 +3,6 @@#include <assert.h>#include <string.h>-#include "config.h"#include "util/buffer_util.h"#include "util/log.h"#include "util/str_util.h"diff --git a/app/src/control_msg.h b/app/src/control_msg.hindex 5014a84c..e23cc89c 100644--- a/app/src/control_msg.h+++ b/app/src/control_msg.h@@ -5,7 +5,7 @@#include <stddef.h>#include <stdint.h>-#include "config.h"+#include "common.h"#include "android/input.h"#include "android/keycodes.h"#include "coords.h"diff --git a/app/src/controller.c b/app/src/controller.cindex c5897e5d..6bfb80d3 100644--- a/app/src/controller.c+++ b/app/src/controller.c@@ -2,7 +2,6 @@#include <assert.h>-#include "config.h"#include "util/lock.h"#include "util/log.h"diff --git a/app/src/controller.h b/app/src/controller.hindex 8011ef6a..5ef8755a 100644--- a/app/src/controller.h+++ b/app/src/controller.h@@ -5,7 +5,7 @@#include <SDL2/SDL_mutex.h>#include <SDL2/SDL_thread.h>-#include "config.h"+#include "common.h"#include "control_msg.h"#include "receiver.h"#include "util/cbuf.h"diff --git a/app/src/decoder.c b/app/src/decoder.cindex 49d4ce86..50c55ab2 100644--- a/app/src/decoder.c+++ b/app/src/decoder.c@@ -7,8 +7,6 @@#include <SDL2/SDL_thread.h>#include <unistd.h>-#include "config.h"-#include "compat.h"#include "events.h"#include "recorder.h"#include "video_buffer.h"diff --git a/app/src/decoder.h b/app/src/decoder.hindex f243812c..8a3bc297 100644--- a/app/src/decoder.h+++ b/app/src/decoder.h@@ -4,7 +4,7 @@#include <stdbool.h>#include <libavformat/avformat.h>-#include "config.h"+#include "common.h"struct video_buffer;diff --git a/app/src/device.c b/app/src/device.cindex f4c2628b..094dc616 100644--- a/app/src/device.c+++ b/app/src/device.c@@ -1,6 +1,5 @@#include "device.h"-#include "config.h"#include "util/log.h"booldiff --git a/app/src/device.h b/app/src/device.hindex 5f30194f..c21b1ace 100644--- a/app/src/device.h+++ b/app/src/device.h@@ -3,7 +3,7 @@#include <stdbool.h>-#include "config.h"+#include "common.h"#include "coords.h"#include "util/net.h"diff --git a/app/src/device_msg.c b/app/src/device_msg.cindex 09e68936..c82ce628 100644--- a/app/src/device_msg.c+++ b/app/src/device_msg.c@@ -2,7 +2,6 @@#include <string.h>-#include "config.h"#include "util/buffer_util.h"#include "util/log.h"diff --git a/app/src/device_msg.h b/app/src/device_msg.hindex 4b681e2c..b1860726 100644--- a/app/src/device_msg.h+++ b/app/src/device_msg.h@@ -5,7 +5,7 @@#include <stdint.h>#include <unistd.h>-#include "config.h"+#include "common.h"#define DEVICE_MSG_MAX_SIZE (1 << 18) // 256k// type: 1 byte; length: 4 bytesdiff --git a/app/src/event_converter.c b/app/src/event_converter.cindex ab48898d..cf010a16 100644--- a/app/src/event_converter.c+++ b/app/src/event_converter.c@@ -1,7 +1,5 @@#include "event_converter.h"-#include "config.h"-#define MAP(FROM, TO) case FROM: *to = TO; return true#define FAIL default: return falsediff --git a/app/src/event_converter.h b/app/src/event_converter.hindex c41887e1..cbd578a0 100644--- a/app/src/event_converter.h+++ b/app/src/event_converter.h@@ -4,7 +4,7 @@#include <stdbool.h>#include <SDL2/SDL_events.h>-#include "config.h"+#include "common.h"#include "control_msg.h"booldiff --git a/app/src/file_handler.c b/app/src/file_handler.cindex 5efbce0e..3ad92c05 100644--- a/app/src/file_handler.c+++ b/app/src/file_handler.c@@ -3,7 +3,6 @@#include <assert.h>#include <string.h>-#include "config.h"#include "adb.h"#include "util/lock.h"#include "util/log.h"diff --git a/app/src/file_handler.h b/app/src/file_handler.hindex 71b58952..6649b9ea 100644--- a/app/src/file_handler.h+++ b/app/src/file_handler.h@@ -5,7 +5,7 @@#include <SDL2/SDL_mutex.h>#include <SDL2/SDL_thread.h>-#include "config.h"+#include "common.h"#include "adb.h"#include "util/cbuf.h"diff --git a/app/src/fps_counter.c b/app/src/fps_counter.cindex b4dd8b9b..e7607409 100644--- a/app/src/fps_counter.c+++ b/app/src/fps_counter.c@@ -3,7 +3,6 @@#include <assert.h>#include <SDL2/SDL_timer.h>-#include "config.h"#include "util/lock.h"#include "util/log.h"diff --git a/app/src/fps_counter.h b/app/src/fps_counter.hindex 52157172..2c13b3e2 100644--- a/app/src/fps_counter.h+++ b/app/src/fps_counter.h@@ -7,7 +7,7 @@#include <SDL2/SDL_mutex.h>#include <SDL2/SDL_thread.h>-#include "config.h"+#include "common.h"struct fps_counter {SDL_Thread *thread;diff --git a/app/src/input_manager.c b/app/src/input_manager.cindex bab85660..df01ea38 100644--- a/app/src/input_manager.c+++ b/app/src/input_manager.c@@ -3,7 +3,6 @@#include <assert.h>#include <SDL2/SDL_keycode.h>-#include "config.h"#include "event_converter.h"#include "util/lock.h"#include "util/log.h"diff --git a/app/src/input_manager.h b/app/src/input_manager.hindex ce53792b..66daa9dd 100644--- a/app/src/input_manager.h+++ b/app/src/input_manager.h@@ -5,7 +5,7 @@#include <SDL2/SDL.h>-#include "config.h"+#include "common.h"#include "controller.h"#include "fps_counter.h"#include "scrcpy.h"diff --git a/app/src/main.c b/app/src/main.cindex 71125673..18b9c710 100644--- a/app/src/main.c+++ b/app/src/main.c@@ -7,9 +7,8 @@#define SDL_MAIN_HANDLED // avoid link error on Linux Windows Subsystem#include <SDL2/SDL.h>-#include "config.h"+#include "common.h"#include "cli.h"-#include "compat.h"#include "util/log.h"static voiddiff --git a/app/src/opengl.h b/app/src/opengl.hindex f0a89a14..1c1e4658 100644--- a/app/src/opengl.h+++ b/app/src/opengl.h@@ -4,7 +4,7 @@#include <stdbool.h>#include <SDL2/SDL_opengl.h>-#include "config.h"+#include "common.h"struct sc_opengl {const char *version;diff --git a/app/src/receiver.c b/app/src/receiver.cindex 307eb5d5..5b97f88b 100644--- a/app/src/receiver.c+++ b/app/src/receiver.c@@ -3,7 +3,6 @@#include <assert.h>#include <SDL2/SDL_clipboard.h>-#include "config.h"#include "device_msg.h"#include "util/lock.h"#include "util/log.h"diff --git a/app/src/receiver.h b/app/src/receiver.hindex 8387903b..8f628238 100644--- a/app/src/receiver.h+++ b/app/src/receiver.h@@ -5,7 +5,7 @@#include <SDL2/SDL_mutex.h>#include <SDL2/SDL_thread.h>-#include "config.h"+#include "common.h"#include "util/net.h"// receive events from the devicediff --git a/app/src/recorder.c b/app/src/recorder.cindex e31492c0..6558d804 100644--- a/app/src/recorder.c+++ b/app/src/recorder.c@@ -3,8 +3,6 @@#include <assert.h>#include <libavutil/time.h>-#include "config.h"-#include "compat.h"#include "util/lock.h"#include "util/log.h"diff --git a/app/src/recorder.h b/app/src/recorder.hindex 43a0a395..fc05d06c 100644--- a/app/src/recorder.h+++ b/app/src/recorder.h@@ -6,7 +6,7 @@#include <SDL2/SDL_mutex.h>#include <SDL2/SDL_thread.h>-#include "config.h"+#include "common.h"#include "coords.h"#include "scrcpy.h"#include "util/queue.h"diff --git a/app/src/scrcpy.c b/app/src/scrcpy.cindex c1aedcca..ecc7a0e6 100644--- a/app/src/scrcpy.c+++ b/app/src/scrcpy.c@@ -13,8 +13,6 @@# include <windows.h>#endif-#include "config.h"-#include "compat.h"#include "controller.h"#include "decoder.h"#include "device.h"diff --git a/app/src/scrcpy.h b/app/src/scrcpy.hindex c1d7b612..08bce7e3 100644--- a/app/src/scrcpy.h+++ b/app/src/scrcpy.h@@ -5,7 +5,7 @@#include <stddef.h>#include <stdint.h>-#include "config.h"+#include "common.h"enum sc_log_level {SC_LOG_LEVEL_DEBUG,diff --git a/app/src/screen.c b/app/src/screen.cindex fe2bc867..5bdfac2a 100644--- a/app/src/screen.c+++ b/app/src/screen.c@@ -4,9 +4,6 @@#include <string.h>#include <SDL2/SDL.h>-#include "config.h"-#include "common.h"-#include "compat.h"#include "icon.xpm"#include "scrcpy.h"#include "tiny_xpm.h"diff --git a/app/src/screen.h b/app/src/screen.hindex 0e87d1c9..820c7382 100644--- a/app/src/screen.h+++ b/app/src/screen.h@@ -5,7 +5,7 @@#include <SDL2/SDL.h>#include <libavformat/avformat.h>-#include "config.h"+#include "common.h"#include "coords.h"#include "opengl.h"diff --git a/app/src/server.c b/app/src/server.cindex cb2a24db..841af82f 100644--- a/app/src/server.c+++ b/app/src/server.c@@ -9,7 +9,6 @@#include <SDL2/SDL_timer.h>#include <SDL2/SDL_platform.h>-#include "config.h"#include "adb.h"#include "util/lock.h"#include "util/log.h"diff --git a/app/src/server.h b/app/src/server.hindex b607d691..b48bcd61 100644--- a/app/src/server.h+++ b/app/src/server.h@@ -6,7 +6,7 @@#include <stdint.h>#include <SDL2/SDL_thread.h>-#include "config.h"+#include "common.h"#include "adb.h"#include "scrcpy.h"#include "util/log.h"diff --git a/app/src/stream.c b/app/src/stream.cindex dd2dbd76..e4c9f387 100644--- a/app/src/stream.c+++ b/app/src/stream.c@@ -8,8 +8,6 @@#include <SDL2/SDL_thread.h>#include <unistd.h>-#include "config.h"-#include "compat.h"#include "decoder.h"#include "events.h"#include "recorder.h"diff --git a/app/src/stream.h b/app/src/stream.hindex cd09d959..7b0a5d42 100644--- a/app/src/stream.h+++ b/app/src/stream.h@@ -7,7 +7,7 @@#include <SDL2/SDL_atomic.h>#include <SDL2/SDL_thread.h>-#include "config.h"+#include "common.h"#include "util/net.h"struct video_buffer;diff --git a/app/src/sys/unix/process.c b/app/src/sys/unix/process.cindex 00a8d81c..dc4f5649 100644--- a/app/src/sys/unix/process.c+++ b/app/src/sys/unix/process.c@@ -11,8 +11,6 @@#include "util/process.h"-#include "config.h"-#include <errno.h>#include <fcntl.h>#include <limits.h>diff --git a/app/src/sys/win/process.c b/app/src/sys/win/process.cindex f2a86b22..f087625c 100644--- a/app/src/sys/win/process.c+++ b/app/src/sys/win/process.c@@ -3,7 +3,6 @@#include <assert.h>#include <sys/stat.h>-#include "config.h"#include "util/log.h"#include "util/str_util.h"diff --git a/app/src/tiny_xpm.c b/app/src/tiny_xpm.cindex feb3d1cb..df1f9e53 100644--- a/app/src/tiny_xpm.c+++ b/app/src/tiny_xpm.c@@ -6,7 +6,6 @@#include <stdio.h>#include <stdlib.h>-#include "config.h"#include "util/log.h"struct index {diff --git a/app/src/tiny_xpm.h b/app/src/tiny_xpm.hindex 6e6f8035..2dcbeb07 100644--- a/app/src/tiny_xpm.h+++ b/app/src/tiny_xpm.h@@ -3,7 +3,7 @@#include <SDL2/SDL.h>-#include "config.h"+#include "common.h"SDL_Surface *read_xpm(char *xpm[]);diff --git a/app/src/util/buffer_util.h b/app/src/util/buffer_util.hindex 17234e42..265704bc 100644--- a/app/src/util/buffer_util.h+++ b/app/src/util/buffer_util.h@@ -4,7 +4,7 @@#include <stdbool.h>#include <stdint.h>-#include "config.h"+#include "common.h"static inline voidbuffer_write16be(uint8_t *buf, uint16_t value) {diff --git a/app/src/util/cbuf.h b/app/src/util/cbuf.hindex c18e4680..6abc984b 100644--- a/app/src/util/cbuf.h+++ b/app/src/util/cbuf.h@@ -5,7 +5,7 @@#include <stdbool.h>#include <unistd.h>-#include "config.h"+#include "common.h"// To define a circular buffer type of 20 ints:// struct cbuf_int CBUF(int, 20);diff --git a/app/src/util/lock.h b/app/src/util/lock.hindex cb7c318c..a0a044b1 100644--- a/app/src/util/lock.h+++ b/app/src/util/lock.h@@ -4,7 +4,7 @@#include <stdint.h>#include <SDL2/SDL_mutex.h>-#include "config.h"+#include "common.h"#include "log.h"static inline voiddiff --git a/app/src/util/net.c b/app/src/util/net.cindex efce6fa9..bbf57bbc 100644--- a/app/src/util/net.c+++ b/app/src/util/net.c@@ -3,7 +3,6 @@#include <stdio.h>#include <SDL2/SDL_platform.h>-#include "config.h"#include "log.h"#ifdef __WINDOWS__diff --git a/app/src/util/net.h b/app/src/util/net.hindex ffd5dd89..f86c048d 100644--- a/app/src/util/net.h+++ b/app/src/util/net.h@@ -17,7 +17,7 @@typedef int socket_t;#endif-#include "config.h"+#include "common.h"boolnet_init(void);diff --git a/app/src/util/process.h b/app/src/util/process.hindex ad2bc0d0..f91553d4 100644--- a/app/src/util/process.h+++ b/app/src/util/process.h@@ -3,7 +3,7 @@#include <stdbool.h>-#include "config.h"+#include "common.h"#ifdef _WIN32diff --git a/app/src/util/queue.h b/app/src/util/queue.hindex 12bc9e89..6092c712 100644--- a/app/src/util/queue.h+++ b/app/src/util/queue.h@@ -6,7 +6,7 @@#include <stdbool.h>#include <stddef.h>-#include "config.h"+#include "common.h"// To define a queue type of "struct foo":// struct queue_foo QUEUE(struct foo);diff --git a/app/src/util/str_util.c b/app/src/util/str_util.cindex ce0498a5..babce4a1 100644--- a/app/src/util/str_util.c+++ b/app/src/util/str_util.c@@ -12,8 +12,6 @@#include <SDL2/SDL_stdinc.h>-#include "config.h"-size_txstrncpy(char *dest, const char *src, size_t n) {size_t i;diff --git a/app/src/util/str_util.h b/app/src/util/str_util.hindex c7f26cdb..dd523400 100644--- a/app/src/util/str_util.h+++ b/app/src/util/str_util.h@@ -4,7 +4,7 @@#include <stdbool.h>#include <stddef.h>-#include "config.h"+#include "common.h"// like strncpy, except:// - it copies at most n-1 charsdiff --git a/app/src/video_buffer.c b/app/src/video_buffer.cindex 629680d9..d656c6f4 100644--- a/app/src/video_buffer.c+++ b/app/src/video_buffer.c@@ -5,7 +5,6 @@#include <libavutil/avutil.h>#include <libavformat/avformat.h>-#include "config.h"#include "util/lock.h"#include "util/log.h"diff --git a/app/src/video_buffer.h b/app/src/video_buffer.hindex 303b3fc2..ddd639ad 100644--- a/app/src/video_buffer.h+++ b/app/src/video_buffer.h@@ -4,7 +4,7 @@#include <stdbool.h>#include <SDL2/SDL_mutex.h>-#include "config.h"+#include "common.h"#include "fps_counter.h"// forward declarationsdiff --git a/app/tests/test_cli.c b/app/tests/test_cli.cindex 1024dba6..9699b024 100644--- a/app/tests/test_cli.c+++ b/app/tests/test_cli.c@@ -1,8 +1,8 @@#include <assert.h>#include <string.h>-#include "cli.h"#include "common.h"+#include "cli.h"#include "scrcpy.h"static void test_flag_version(void) {