Merge branch 'dev'

Spread resource structures among implementation files.
i-rinat · Dec 14, 2017 · 6834cbf · 6834cbf
2 parents 4a29ab5 + 1313e4e
commit 6834cbf
Show file tree

Hide file tree

Showing 160 changed files with 1,261 additions and 1,236 deletions.
diff --git a/src/async_network.c b/src/async_network.c
@@ -23,26 +23,30 @@
  */
 
 #include "async_network.h"
-#include <glib.h>
-#include <stdio.h>
-#include <pthread.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+#include "config.h"
+#include "pp_resource.h"
+#include "ppb_core.h"
+#include "ppb_host_resolver.h"
+#include "ppb_message_loop.h"
+#include "ppb_tcp_socket.h"
+#include "ppb_udp_socket.h"
+#include "trace.h"
 #include <arpa/inet.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <event2/event.h>
-#include <event2/util.h>
 #include <event2/dns.h>
+#include <event2/event.h>
 #include <event2/thread.h>
+#include <event2/util.h>
+#include <glib.h>
+#include <netdb.h>
+#include <netinet/in.h>
 #include <ppapi/c/pp_errors.h>
 #include <ppapi/c/private/ppb_net_address_private.h>
-#include "pp_resource.h"
-#include "ppb_core.h"
-#include "trace.h"
-#include "config.h"
-#include "ppb_message_loop.h"
-
+#include <pthread.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 static struct event_base *event_b = NULL;
 static struct evdns_base *evdns_b = NULL;

diff --git a/src/async_network.h b/src/async_network.h
@@ -25,11 +25,10 @@
 #pragma once
 
 #include <ppapi/c/pp_completion_callback.h>
-#include <ppapi/c/pp_resource.h>
 #include <ppapi/c/pp_instance.h>
+#include <ppapi/c/pp_resource.h>
 #include <ppapi/c/private/ppb_net_address_private.h>
 
-
 enum async_network_task_type_e {
     ASYNC_NETWORK_TCP_CONNECT,
     ASYNC_NETWORK_TCP_CONNECT_WITH_NETADDRESS,

diff --git a/src/audio_thread.h b/src/audio_thread.h
@@ -26,7 +26,6 @@
 
 #include <stdint.h>
 
-
 typedef enum {
     STREAM_PLAYBACK,
     STREAM_CAPTURE,

diff --git a/src/audio_thread_alsa.c b/src/audio_thread_alsa.c
@@ -23,16 +23,15 @@
  */
 
 #include "audio_thread.h"
-#include <asoundlib.h>
-#include <pthread.h>
-#include <glib.h>
-#include <unistd.h>
-#include "trace.h"
 #include "config.h"
-#include "utils.h"
 #include "eintr_retry.h"
 #include "ppb_message_loop.h"
-
+#include "trace.h"
+#include "utils.h"
+#include <asoundlib.h>
+#include <glib.h>
+#include <pthread.h>
+#include <unistd.h>
 
 struct audio_stream_s {
     audio_stream_direction      direction;

diff --git a/src/audio_thread_jack.c b/src/audio_thread_jack.c
@@ -23,16 +23,16 @@
  */
 
 #include "audio_thread.h"
-#include <pthread.h>
+#include "config.h"
+#include "trace.h"
+#include <glib.h>
 #include <jack/jack.h>
 #include <jack/ringbuffer.h>
+#include <math.h>
+#include <pthread.h>
 #include <soxr.h>
-#include <glib.h>
-#include <string.h>
 #include <stdlib.h>
-#include <math.h>
-#include "trace.h"
-#include "config.h"
+#include <string.h>
 
 #define CLIENT_NAME     "freshwrapper"
 

diff --git a/src/audio_thread_noaudio.c b/src/audio_thread_noaudio.c
@@ -23,15 +23,14 @@
  */
 
 #include "audio_thread.h"
-#include <pthread.h>
-#include <unistd.h>
-#include <glib.h>
-#include "trace.h"
 #include "config.h"
-#include "utils.h"
 #include "eintr_retry.h"
 #include "ppb_message_loop.h"
-
+#include "trace.h"
+#include "utils.h"
+#include <glib.h>
+#include <pthread.h>
+#include <unistd.h>
 
 struct audio_stream_s {
     size_t                      sample_frame_count;

diff --git a/src/audio_thread_pulseaudio.c b/src/audio_thread_pulseaudio.c
@@ -23,17 +23,15 @@
  */
 
 #include "audio_thread.h"
+#include "trace.h"
+#include <glib.h>
 #include <pthread.h>
-#include <pulse/pulseaudio.h>
 #include <pulse/mainloop.h>
-#include <glib.h>
+#include <pulse/pulseaudio.h>
 #include <string.h>
-#include "trace.h"
-
 
 #define CLIENT_NAME     "freshwrapper"
 
-
 struct audio_stream_s {
     struct pa_sample_spec       sample_spec;
     audio_stream_direction      direction;

diff --git a/src/compat.c b/src/compat.c
@@ -24,7 +24,6 @@
 
 #include "compat.h"
 
-
 #ifdef VER
 #error macro name collision
 #endif

diff --git a/src/compat.h b/src/compat.h
@@ -24,9 +24,9 @@
 
 #pragma once
 
-#include <glib.h>
-#include <X11/Xlib.h>
 #include "gtk_wrapper.h"
+#include <X11/Xlib.h>
+#include <glib.h>
 
 #ifdef VER
 #error macro name collision

diff --git a/src/config.c b/src/config.c
@@ -23,15 +23,14 @@
  */
 
 #include "config.h"
-#include "config_priv.h"
 #include "config_parser/config_parser.h"
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <locale.h>
-#include <glib.h>
+#include "config_priv.h"
 #include "trace_core.h"
-
+#include <glib.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 static struct fpp_config_s default_config = {
     .audio_buffer_min_ms =      20,

diff --git a/src/config.h b/src/config.h
@@ -26,7 +26,6 @@
 
 #include <stdint.h>
 
-
 struct fpp_config_s {
     int     audio_buffer_min_ms;
     int     audio_buffer_max_ms;

diff --git a/src/config_parser/config_parser.c b/src/config_parser/config_parser.c
@@ -24,11 +24,10 @@
 
 #include "config_parser.h"
 #include <glib.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
-
 struct cfg_s {
     GHashTable         *entries_ht;
     cfg_report_error_f *error_func;

diff --git a/src/encoding_alias.c b/src/encoding_alias.c
@@ -24,10 +24,9 @@
 
 #include "encoding_alias.h"
 #include <glib.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
-
+#include <string.h>
 
 enum {
     UIGNORE = 0,

diff --git a/src/encoding_alias.h b/src/encoding_alias.h
@@ -24,6 +24,5 @@
 
 #pragma once
 
-
 const char *
 encoding_alias_get_canonical_name(const char *name);
diff --git a/src/font.c b/src/font.c
@@ -24,11 +24,12 @@
 
 #include "font.h"
 #include "pp_resource.h"
-#include "tables.h"
-#include <ppapi/c/pp_errors.h>
+#include "ppb_image_data.h"
 #include "ppb_var.h"
+#include "tables.h"
 #include "trace.h"
-
+#include <pango/pangocairo.h>
+#include <ppapi/c/pp_errors.h>
 
 struct PP_Var
 fpp_font_get_font_families(void)

diff --git a/src/font.h b/src/font.h
@@ -24,10 +24,9 @@
 
 #pragma once
 
+#include <pango/pango.h>
 #include <ppapi/c/dev/ppb_font_dev.h>
 #include <ppapi/c/trusted/ppb_browser_font_trusted.h>
-#include <pango/pango.h>
-
 
 struct fpp_font {
     PangoFont              *font;

diff --git a/src/glx.h b/src/glx.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#define GLX_GLXEXT_LEGACY  // prevent inclusion of glxext.h
+
+#include <GL/glx.h>
diff --git a/src/gtk_wrapper.c b/src/gtk_wrapper.c
@@ -25,11 +25,10 @@
 #define _GNU_SOURCE
 
 #include "gtk_wrapper.h"
+#include "trace_core.h"
 #include <link.h>
 #include <stdio.h>
 #include <string.h>
-#include "trace_core.h"
-
 
 static struct {
     int     major_version;

diff --git a/src/gtk_wrapper.h b/src/gtk_wrapper.h
@@ -24,11 +24,10 @@
 
 #pragma once
 
-#include <glib.h>
-#include <pango/pango.h>
 #include <X11/Xlib.h>
 #include <cairo.h>
-
+#include <glib.h>
+#include <pango/pango.h>
 
 // GTK+ type mockups
 

diff --git a/src/header_parser.c b/src/header_parser.c
@@ -23,11 +23,10 @@
  */
 
 #include "header_parser.h"
-#include <string.h>
 #include <ctype.h>
-#include <stdlib.h>
 #include <stdio.h>
-
+#include <stdlib.h>
+#include <string.h>
 
 struct parsed_headers_s *
 hp_parse_headers(const char *headers)

diff --git a/src/keycodeconvert.c b/src/keycodeconvert.c
@@ -24,9 +24,11 @@
 
 #include "keycodeconvert.h"
 #include "keycodepp.h"
+
 #define XK_3270
-#include <X11/keysym.h>
+
 #include <X11/XF86keysym.h>
+#include <X11/keysym.h>
 #include <ppapi/c/ppb_input_event.h>
 
 int

diff --git a/src/main_thread.c b/src/main_thread.c
@@ -23,11 +23,12 @@
  */
 
 #include "main_thread.h"
-#include "ppb_message_loop.h"
 #include "pp_resource.h"
-#include <pthread.h>
+#include "ppb_instance.h"
+#include "ppb_message_loop.h"
 #include "trace.h"
-
+#include "utils.h"
+#include <pthread.h>
 
 static
 void

diff --git a/src/n2p_proxy_class.c b/src/n2p_proxy_class.c
@@ -27,17 +27,17 @@
  */
 
 #include "n2p_proxy_class.h"
-#include "ppapi/c/dev/deprecated_bool.h"
-#include "trace.h"
-#include "tables.h"
 #include "pp_resource.h"
-#include <npapi/npruntime.h>
+#include "ppapi/c/dev/deprecated_bool.h"
 #include "ppb_core.h"
-#include "ppb_var.h"
 #include "ppb_message_loop.h"
+#include "ppb_var.h"
+#include "tables.h"
+#include "trace.h"
+#include "utils.h"
+#include <npapi/npruntime.h>
 #include <ppapi/c/pp_errors.h>
 
-
 struct has_property_param_s {
     struct PP_Var       name;
     struct PP_Var      *exception;

diff --git a/src/np_asynccall.c b/src/np_asynccall.c
@@ -23,10 +23,9 @@
  */
 
 #include "np_asynccall.h"
-#include "utils.h"
 #include "trace_core.h"
+#include "utils.h"
 #include <glib.h>
-#include <glib-unix.h>
 
 static GMainContext *g_main_context_of_main_thread;
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,6 @@ @@
     #include "compat.h"
     #ifdef VER
     #error macro name collision
     #endif
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,6 +24,5 @@

		#pragma once


		const char *
		encoding_alias_get_canonical_name(const char *name);