Fix log instance mismatch

This commit is contained in:
dijunkun
2024-07-17 14:45:30 +08:00
parent 9702805331
commit d0cd2fe9ab
15 changed files with 32 additions and 37 deletions

View File

@@ -1,6 +1,6 @@
#include "platform.h"
#include "log.h"
#include "rd_log.h"
#ifdef _WIN32
#include <Winsock2.h>

View File

@@ -1,6 +1,6 @@
#include "mouse_controller.h"
#include "log.h"
#include "rd_log.h"
MouseController::MouseController() {}

View File

@@ -6,7 +6,7 @@
#endif
#endif
#include "log.h"
#include "rd_log.h"
#include "render.h"
int main(int argc, char *argv[]) {

View File

@@ -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

View File

@@ -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 <chrono>
#include <iomanip>
@@ -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

View File

@@ -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

View File

@@ -1,6 +1,6 @@
#include "layout_style.h"
#include "localization.h"
#include "log.h"
#include "rd_log.h"
#include "render.h"
int Render::ConnectionStatusWindow() {

View File

@@ -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() {

View File

@@ -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() {

View File

@@ -1,5 +1,5 @@
#include "IconsFontAwesome6.h"
#include "log.h"
#include "rd_log.h"
#include "render.h"
int Render::MenuWindow() {

View File

@@ -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() {

View File

@@ -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

View File

@@ -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() {