refactor(logging): separate logging from main (#2110)

src/platform/common.h

@@ -10,7 +10,7 @@
 #include <mutex>
 #include <string>
 
-#include "src/main.h"
+#include "src/logging.h"
 #include "src/thread_safe.h"
 #include "src/utility.h"
 #include "src/video_colorspace.h"

src/platform/linux/audio.cpp

@@ -14,6 +14,7 @@
 #include "src/platform/common.h"
 
 #include "src/config.h"
+#include "src/logging.h"
 #include "src/main.h"
 #include "src/thread_safe.h"
 

src/platform/linux/cuda.cpp

@@ -19,6 +19,7 @@ extern "C" {
 
 #include "cuda.h"
 #include "graphics.h"
+#include "src/logging.h"
 #include "src/main.h"
 #include "src/utility.h"
 #include "src/video.h"

src/platform/linux/graphics.cpp

@@ -3,6 +3,8 @@
  * @brief todo
  */
 #include "graphics.h"
+#include "src/logging.h"
+#include "src/main.h"
 #include "src/video.h"
 
 #include <fcntl.h>

src/platform/linux/graphics.h

@@ -11,7 +11,7 @@
 #include <glad/gl.h>
 
 #include "misc.h"
-#include "src/main.h"
+#include "src/logging.h"
 #include "src/platform/common.h"
 #include "src/utility.h"
 #include "src/video_colorspace.h"

src/platform/linux/input.cpp

@@ -23,6 +23,7 @@
 
 #include "src/config.h"
 #include "src/input.h"
+#include "src/logging.h"
 #include "src/main.h"
 #include "src/platform/common.h"
 #include "src/utility.h"

src/platform/linux/kmsgrab.cpp

@@ -14,6 +14,7 @@
 
 #include <filesystem>
 
+#include "src/logging.h"
 #include "src/main.h"
 #include "src/platform/common.h"
 #include "src/round_robin.h"

src/platform/linux/misc.cpp

@@ -26,6 +26,7 @@
 #include "graphics.h"
 #include "misc.h"
 #include "src/config.h"
+#include "src/logging.h"
 #include "src/main.h"
 #include "src/platform/common.h"
 #include "vaapi.h"

src/platform/linux/publish.cpp

@@ -7,6 +7,7 @@
 #include <thread>
 
 #include "misc.h"
+#include "src/logging.h"
 #include "src/main.h"
 #include "src/nvhttp.h"
 #include "src/platform/common.h"

src/platform/linux/vaapi.cpp

@@ -26,7 +26,7 @@ vaSyncBuffer(
 #include "graphics.h"
 #include "misc.h"
 #include "src/config.h"
-#include "src/main.h"
+#include "src/logging.h"
 #include "src/platform/common.h"
 #include "src/utility.h"
 #include "src/video.h"

src/platform/linux/wayland.cpp

@@ -9,7 +9,7 @@
 #include <cstdlib>
 
 #include "graphics.h"
-#include "src/main.h"
+#include "src/logging.h"
 #include "src/platform/common.h"
 #include "src/round_robin.h"
 #include "src/utility.h"

src/platform/linux/wlgrab.cpp

@@ -4,6 +4,7 @@
  */
 #include "src/platform/common.h"
 
+#include "src/logging.h"
 #include "src/main.h"
 #include "src/video.h"
 

src/platform/linux/x11grab.cpp

@@ -17,6 +17,7 @@
 #include <xcb/xfixes.h>
 
 #include "src/config.h"
+#include "src/logging.h"
 #include "src/main.h"
 #include "src/task_pool.h"
 #include "src/video.h"

src/platform/macos/display.mm

@@ -8,6 +8,7 @@
 #include "src/platform/macos/nv12_zero_device.h"
 
 #include "src/config.h"
+#include "src/logging.h"
 
 // Avoid conflict between AVFoundation and libavutil both defining AVMediaType
 #define AVMediaType AVMediaType_FFmpeg

src/platform/macos/input.cpp

@@ -6,7 +6,7 @@
 #include <chrono>
 #include <mach/mach.h>
 
-#include "src/main.h"
+#include "src/logging.h"
 #include "src/platform/common.h"
 #include "src/utility.h"
 

src/platform/macos/microphone.mm

@@ -6,6 +6,7 @@
 #include "src/platform/macos/av_audio.h"
 
 #include "src/config.h"
+#include "src/logging.h"
 
 namespace platf {
   using namespace std::literals;

src/platform/macos/misc.mm

@@ -18,6 +18,7 @@
 #include <pwd.h>
 
 #include "misc.h"
+#include "src/logging.h"
 #include "src/main.h"
 #include "src/platform/common.h"
 

src/platform/macos/publish.cpp

@@ -7,6 +7,7 @@
 #include <thread>
 
 #include "misc.h"
+#include "src/logging.h"
 #include "src/main.h"
 #include "src/nvhttp.h"
 #include "src/platform/common.h"

src/platform/windows/audio.cpp

@@ -16,7 +16,7 @@
 #include <avrt.h>
 
 #include "src/config.h"
-#include "src/main.h"
+#include "src/logging.h"
 #include "src/platform/common.h"
 
 // Must be the last included file

src/platform/windows/display_base.cpp

@@ -15,6 +15,7 @@ typedef long NTSTATUS;
 #include "display.h"
 #include "misc.h"
 #include "src/config.h"
+#include "src/logging.h"
 #include "src/main.h"
 #include "src/platform/common.h"
 #include "src/stat_trackers.h"

src/platform/windows/display_ram.cpp

@@ -5,7 +5,7 @@
 #include "display.h"
 
 #include "misc.h"
-#include "src/main.h"
+#include "src/logging.h"
 
 namespace platf {
   using namespace std::literals;

src/platform/windows/display_vram.cpp

@@ -17,7 +17,7 @@ extern "C" {
 #include "display.h"
 #include "misc.h"
 #include "src/config.h"
-#include "src/main.h"
+#include "src/logging.h"
 #include "src/nvenc/nvenc_config.h"
 #include "src/nvenc/nvenc_d3d11.h"
 #include "src/nvenc/nvenc_utils.h"

src/platform/windows/input.cpp

@@ -12,6 +12,7 @@
 #include "keylayout.h"
 #include "misc.h"
 #include "src/config.h"
+#include "src/logging.h"
 #include "src/main.h"
 #include "src/platform/common.h"
 

src/platform/windows/misc.cpp

@@ -29,6 +29,7 @@
 #include <sddl.h>
 // clang-format on
 
+#include "src/logging.h"
 #include "src/main.h"
 #include "src/platform/common.h"
 #include "src/utility.h"

src/platform/windows/nvprefs/nvprefs_common.cpp

@@ -1,6 +1,6 @@
 // local includes
 #include "nvprefs_common.h"
-#include "src/main.h"  // sunshine boost::log severity levels
+#include "src/logging.h"
 
 // read user override preferences from global sunshine config
 #include "src/config.h"

src/platform/windows/nvprefs/nvprefs_interface.cpp

@@ -1,7 +1,9 @@
+// standard includes
+#include <cassert>
+
 // local includes
-#include "nvprefs_interface.h"
 #include "driver_settings.h"
-#include "src/main.h"  // main include for assert
+#include "nvprefs_interface.h"
 #include "undo_file.h"
 
 namespace {

src/platform/windows/publish.cpp

@@ -13,6 +13,7 @@
 
 #include "misc.h"
 #include "src/config.h"
+#include "src/logging.h"
 #include "src/main.h"
 #include "src/network.h"
 #include "src/nvhttp.h"