diff --git a/src/log/rd_log.cpp b/src/log/rd_log.cpp index 55ae6de..d6f2a20 100644 --- a/src/log/rd_log.cpp +++ b/src/log/rd_log.cpp @@ -1,7 +1,7 @@ #include "rd_log.h" -std::shared_ptr get_logger() { - if (auto logger = spdlog::get(LOGGER_NAME)) { +std::shared_ptr get_rd_logger() { + if (auto logger = spdlog::get(RD_LOGGER_NAME)) { return logger; } @@ -18,7 +18,7 @@ std::shared_ptr get_logger() { std::stringstream ss; std::string filename; - ss << LOGGER_NAME; + ss << RD_LOGGER_NAME; ss << std::put_time(&tm_info, "-%Y%m%d-%H%M%S.log"); ss >> filename; @@ -28,8 +28,8 @@ std::shared_ptr get_logger() { sinks.push_back(std::make_shared( path, 1048576 * 5, 3)); - auto combined_logger = - std::make_shared(LOGGER_NAME, begin(sinks), end(sinks)); + auto combined_logger = std::make_shared( + RD_LOGGER_NAME, begin(sinks), end(sinks)); combined_logger->flush_on(spdlog::level::info); spdlog::register_logger(combined_logger); diff --git a/src/log/rd_log.h b/src/log/rd_log.h index 5fb04fb..829e130 100644 --- a/src/log/rd_log.h +++ b/src/log/rd_log.h @@ -24,16 +24,16 @@ using namespace std::chrono; #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO -constexpr auto LOGGER_NAME = "rd"; +constexpr auto RD_LOGGER_NAME = "rd"; -std::shared_ptr get_logger(); +std::shared_ptr get_rd_logger(); -#define LOG_INFO(...) SPDLOG_LOGGER_INFO(get_logger(), __VA_ARGS__); +#define LOG_INFO(...) SPDLOG_LOGGER_INFO(get_rd_logger(), __VA_ARGS__); -#define LOG_WARN(...) SPDLOG_LOGGER_WARN(get_logger(), __VA_ARGS__); +#define LOG_WARN(...) SPDLOG_LOGGER_WARN(get_rd_logger(), __VA_ARGS__); -#define LOG_ERROR(...) SPDLOG_LOGGER_ERROR(get_logger(), __VA_ARGS__); +#define LOG_ERROR(...) SPDLOG_LOGGER_ERROR(get_rd_logger(), __VA_ARGS__); -#define LOG_FATAL(...) SPDLOG_LOGGER_CRITICAL(get_logger(), __VA_ARGS__); +#define LOG_FATAL(...) SPDLOG_LOGGER_CRITICAL(get_rd_logger(), __VA_ARGS__); #endif \ No newline at end of file diff --git a/src/single_window/render_callback_func.cpp b/src/single_window/render_callback_func.cpp index a0d7d7a..9c5b6ce 100644 --- a/src/single_window/render_callback_func.cpp +++ b/src/single_window/render_callback_func.cpp @@ -115,7 +115,7 @@ void Render::OnReceiveVideoBufferCb(const XVideoFrame *video_frame, event.user.type = STREAM_FRASH; event.user.data1 = props; SDL_PushEvent(&event); - + LOG_ERROR("STREAM_FRASH"); props->streaming_ = true; } } diff --git a/thirdparty/projectx b/thirdparty/projectx index 2512e1e..cd349cd 160000 --- a/thirdparty/projectx +++ b/thirdparty/projectx @@ -1 +1 @@ -Subproject commit 2512e1eb15296f27c6c8619b3a7d63af473b531a +Subproject commit cd349cd98d7a5243baeb68622159c65ba5e2ab95