refactor(mail): move mail to globals

LizardByte · Feb 11, 2024 · a71d3b6 · a71d3b6
1 parent 97c5b88
commit a71d3b6
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 31 deletions.
diff --git a/src/audio.cpp b/src/audio.cpp
@@ -10,7 +10,7 @@
 
 #include "audio.h"
 #include "config.h"
-#include "entry_handler.h"
+#include "globals.h"
 #include "logging.h"
 #include "thread_safe.h"
 #include "utility.h"

diff --git a/src/confighttp.cpp b/src/confighttp.cpp
@@ -29,8 +29,8 @@
 #include "config.h"
 #include "confighttp.h"
 #include "crypto.h"
-#include "entry_handler.h"
 #include "file_handler.h"
+#include "globals.h"
 #include "httpcommon.h"
 #include "logging.h"
 #include "network.h"

diff --git a/src/entry_handler.h b/src/entry_handler.h
@@ -50,31 +50,6 @@ namespace lifetime {
   get_argv();
 }  // namespace lifetime
 
-namespace mail {
-#define MAIL(x)                         \
-  constexpr auto x = std::string_view { \
-    #x                                  \
-  }
-
-  extern safe::mail_t man;
-
-  // Global mail
-  MAIL(shutdown);
-  MAIL(broadcast_shutdown);
-  MAIL(video_packets);
-  MAIL(audio_packets);
-  MAIL(switch_display);
-
-  // Local mail
-  MAIL(touch_port);
-  MAIL(idr);
-  MAIL(invalidate_ref_frames);
-  MAIL(gamepad_feedback);
-  MAIL(hdr);
-#undef MAIL
-
-}  // namespace mail
-
 #ifdef _WIN32
 namespace service_ctrl {
   bool

diff --git a/src/globals.h b/src/globals.h
@@ -7,6 +7,30 @@
 #include "entry_handler.h"
 #include "thread_pool.h"
 
-extern safe::mail_t mail::man;
 extern thread_pool_util::ThreadPool task_pool;
 extern bool display_cursor;
+
+namespace mail {
+#define MAIL(x)                         \
+  constexpr auto x = std::string_view { \
+    #x                                  \
+  }
+
+  extern safe::mail_t man;
+
+  // Global mail
+  MAIL(shutdown);
+  MAIL(broadcast_shutdown);
+  MAIL(video_packets);
+  MAIL(audio_packets);
+  MAIL(switch_display);
+
+  // Local mail
+  MAIL(touch_port);
+  MAIL(idr);
+  MAIL(invalidate_ref_frames);
+  MAIL(gamepad_feedback);
+  MAIL(hdr);
+#undef MAIL
+
+}  // namespace mail
diff --git a/src/nvhttp.cpp b/src/nvhttp.cpp
@@ -22,8 +22,8 @@
 // local includes
 #include "config.h"
 #include "crypto.h"
-#include "entry_handler.h"
 #include "file_handler.h"
+#include "globals.h"
 #include "httpcommon.h"
 #include "logging.h"
 #include "network.h"

diff --git a/src/rtsp.cpp b/src/rtsp.cpp
@@ -16,7 +16,7 @@ extern "C" {
 #include <boost/bind.hpp>
 
 #include "config.h"
-#include "entry_handler.h"
+#include "globals.h"
 #include "input.h"
 #include "logging.h"
 #include "network.h"

diff --git a/src/upnp.cpp b/src/upnp.cpp
@@ -7,7 +7,7 @@
 
 #include "config.h"
 #include "confighttp.h"
-#include "entry_handler.h"
+#include "globals.h"
 #include "logging.h"
 #include "network.h"
 #include "nvhttp.h"