diff --git a/src/common/platform.cpp b/src/common/platform.cpp index 26a4402..354a8b8 100644 --- a/src/common/platform.cpp +++ b/src/common/platform.cpp @@ -1,6 +1,6 @@ #include "platform.h" -#include "log.h" +#include "rd_log.h" #ifdef _WIN32 #include diff --git a/src/device_controller/mouse/windows/mouse_controller.cpp b/src/device_controller/mouse/windows/mouse_controller.cpp index 832fa1c..d814ff0 100644 --- a/src/device_controller/mouse/windows/mouse_controller.cpp +++ b/src/device_controller/mouse/windows/mouse_controller.cpp @@ -1,6 +1,6 @@ #include "mouse_controller.h" -#include "log.h" +#include "rd_log.h" MouseController::MouseController() {} diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 28b3c8a..8e595cb 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -6,7 +6,7 @@ #endif #endif -#include "log.h" +#include "rd_log.h" #include "render.h" int main(int argc, char *argv[]) { diff --git a/src/gui/main_single_peer.cpp b/src/gui/main_single_peer.cpp index 0c4283b..796d694 100644 --- a/src/gui/main_single_peer.cpp +++ b/src/gui/main_single_peer.cpp @@ -24,8 +24,8 @@ #include "imgui.h" #include "imgui_impl_sdl2.h" #include "imgui_impl_sdlrenderer2.h" -#include "log.h" #include "platform.h" +#include "rd_log.h" #include "screen_capturer_factory.h" #define NV12_BUFFER_SIZE 1280 * 720 * 3 / 2 diff --git a/src/log/log.h b/src/log/rd_log.h similarity index 96% rename from src/log/log.h rename to src/log/rd_log.h index c8d7280..4b3d089 100644 --- a/src/log/log.h +++ b/src/log/rd_log.h @@ -1,5 +1,11 @@ -#ifndef _LOG_H_ -#define _LOG_H_ +/* + * @Author: DI JUNKUN + * @Date: 2024-07-17 + * Copyright (c) 2024 by DI JUNKUN, All Rights Reserved. + */ + +#ifndef _RD_LOG_H_ +#define _RD_LOG_H_ #include #include @@ -18,18 +24,7 @@ using namespace std::chrono; #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO -// SPDLOG_TRACE(...) -// SPDLOG_DEBUG(...) -// SPDLOG_INFO(...) -// SPDLOG_WARN(...) -// SPDLOG_ERROR(...) -// SPDLOG_CRITICAL(...) - -#ifdef SIGNAL_LOGGER -constexpr auto LOGGER_NAME = "siganl_server"; -#else -constexpr auto LOGGER_NAME = "remote_desk"; -#endif +constexpr auto LOGGER_NAME = "rd"; #define LOG_INFO(...) \ if (nullptr == spdlog::get(LOGGER_NAME)) { \ @@ -124,4 +119,4 @@ constexpr auto LOGGER_NAME = "remote_desk"; SPDLOG_LOGGER_CRITICAL(spdlog::get(LOGGER_NAME), __VA_ARGS__); \ } -#endif +#endif \ No newline at end of file diff --git a/src/original_version/render.cpp b/src/original_version/render.cpp index 03608f0..acda6f2 100644 --- a/src/original_version/render.cpp +++ b/src/original_version/render.cpp @@ -7,8 +7,8 @@ #include "device_controller_factory.h" #include "layout_style.h" #include "localization.h" -#include "log.h" #include "platform.h" +#include "rd_log.h" #include "screen_capturer_factory.h" // Refresh Event diff --git a/src/single_window/connection_status_window.cpp b/src/single_window/connection_status_window.cpp index 9d109eb..c8b492c 100644 --- a/src/single_window/connection_status_window.cpp +++ b/src/single_window/connection_status_window.cpp @@ -1,6 +1,6 @@ #include "layout_style.h" #include "localization.h" -#include "log.h" +#include "rd_log.h" #include "render.h" int Render::ConnectionStatusWindow() { diff --git a/src/single_window/control_bar.cpp b/src/single_window/control_bar.cpp index c651deb..f0ade53 100644 --- a/src/single_window/control_bar.cpp +++ b/src/single_window/control_bar.cpp @@ -1,7 +1,7 @@ #include "IconsFontAwesome6.h" #include "layout_style.h" #include "localization.h" -#include "log.h" +#include "rd_log.h" #include "render.h" int Render::ControlBar() { diff --git a/src/single_window/local_peer_window.cpp b/src/single_window/local_peer_window.cpp index b5589dd..d4d644f 100644 --- a/src/single_window/local_peer_window.cpp +++ b/src/single_window/local_peer_window.cpp @@ -3,7 +3,7 @@ #include "IconsFontAwesome6.h" #include "layout_style.h" #include "localization.h" -#include "log.h" +#include "rd_log.h" #include "render.h" int Render::LocalWindow() { diff --git a/src/single_window/menu_window.cpp b/src/single_window/menu_window.cpp index 784f079..f3b5984 100644 --- a/src/single_window/menu_window.cpp +++ b/src/single_window/menu_window.cpp @@ -1,5 +1,5 @@ #include "IconsFontAwesome6.h" -#include "log.h" +#include "rd_log.h" #include "render.h" int Render::MenuWindow() { diff --git a/src/single_window/remote_peer_window.cpp b/src/single_window/remote_peer_window.cpp index f4cc55b..12374a8 100644 --- a/src/single_window/remote_peer_window.cpp +++ b/src/single_window/remote_peer_window.cpp @@ -1,7 +1,7 @@ #include "IconsFontAwesome6.h" #include "layout_style.h" #include "localization.h" -#include "log.h" +#include "rd_log.h" #include "render.h" int Render::RemoteWindow() { diff --git a/src/single_window/render.cpp b/src/single_window/render.cpp index 7e0e6f9..d2b983f 100644 --- a/src/single_window/render.cpp +++ b/src/single_window/render.cpp @@ -10,8 +10,8 @@ #include "fa-solid-900.h" #include "layout_style.h" #include "localization.h" -#include "log.h" #include "platform.h" +#include "rd_log.h" #include "screen_capturer_factory.h" // Refresh Event diff --git a/src/single_window/setting_button.cpp b/src/single_window/setting_button.cpp index 04477c4..4d951c9 100644 --- a/src/single_window/setting_button.cpp +++ b/src/single_window/setting_button.cpp @@ -1,7 +1,7 @@ #include "IconsFontAwesome6.h" #include "layout_style.h" #include "localization.h" -#include "log.h" +#include "rd_log.h" #include "render.h" int Render::SettingButton() { diff --git a/thirdparty/projectx b/thirdparty/projectx index 28fb35f..792a286 160000 --- a/thirdparty/projectx +++ b/thirdparty/projectx @@ -1 +1 @@ -Subproject commit 28fb35faf58d401a2c3be72b27bedea6b2a3c4ce +Subproject commit 792a2868998039defbfb6ecba330428d462a1bb5 diff --git a/xmake.lua b/xmake.lua index d268079..f110ce6 100644 --- a/xmake.lua +++ b/xmake.lua @@ -45,21 +45,21 @@ add_packages("spdlog", "imgui") includes("thirdparty") -target("log") +target("rd_log") set_kind("object") add_packages("spdlog") - add_headerfiles("src/log/log.h") + add_headerfiles("src/log/rd_log.h") add_includedirs("src/log", {public = true}) target("common") set_kind("object") - add_deps("log") + add_deps("rd_log") add_files("src/common/*.cpp") add_includedirs("src/common", {public = true}) target("screen_capturer") set_kind("object") - add_deps("log") + add_deps("rd_log") add_packages("libyuv") add_includedirs("src/screen_capturer", {public = true}) if is_os("windows") then @@ -77,7 +77,7 @@ target("screen_capturer") target("device_controller") set_kind("object") - add_deps("log") + add_deps("rd_log") add_includedirs("src/device_controller", {public = true}) if is_os("windows") then add_files("src/device_controller/mouse/windows/*.cpp") @@ -92,7 +92,7 @@ target("device_controller") target("config_center") set_kind("object") - add_deps("log") + add_deps("rd_log") add_files("src/config_center/*.cpp") add_includedirs("src/config_center", {public = true}) @@ -102,7 +102,7 @@ target("localization") target("original_version") set_kind("object") - add_deps("log", "common", "localization", "config_center", "projectx", "screen_capturer", "device_controller") + add_deps("rd_log", "common", "localization", "config_center", "projectx", "screen_capturer", "device_controller") if is_os("macosx") then add_packages("ffmpeg") elseif is_os("linux") then @@ -113,7 +113,7 @@ target("original_version") target("single_window") set_kind("object") - add_deps("log", "common", "localization", "config_center", "projectx", "screen_capturer", "device_controller") + add_deps("rd_log", "common", "localization", "config_center", "projectx", "screen_capturer", "device_controller") if is_os("macosx") then add_packages("ffmpeg") elseif is_os("linux") then @@ -125,7 +125,7 @@ target("single_window") target("remote_desk") set_kind("binary") - add_deps("log", "common", "single_window") + add_deps("rd_log", "common", "single_window") if is_os("macosx") then add_packages("ffmpeg") elseif is_os("linux") then