From eaabf478cc37b2c7a383b5e0511178bf8e798362 Mon Sep 17 00:00:00 2001 From: dijunkun Date: Fri, 29 Nov 2024 17:54:15 +0800 Subject: [PATCH] [feat] update net statistics module --- src/single_window/control_bar.cpp | 16 ++++++++-------- thirdparty/projectx | 2 +- xmake.lua | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/single_window/control_bar.cpp b/src/single_window/control_bar.cpp index 63ee2b2..ed81474 100644 --- a/src/single_window/control_bar.cpp +++ b/src/single_window/control_bar.cpp @@ -219,35 +219,35 @@ int Render::NetTrafficStats() { ImGui::Text("%s", localization::video[localization_language_index_].c_str()); ImGui::TableNextColumn(); - BitrateDisplay((int)net_traffic_stats_.video_in); + BitrateDisplay((int)net_traffic_stats_.video_inbound_stats.bitrate); ImGui::TableNextColumn(); - BitrateDisplay((int)net_traffic_stats_.video_out); + BitrateDisplay((int)net_traffic_stats_.video_outbound_stats.bitrate); ImGui::TableNextRow(); ImGui::TableNextColumn(); ImGui::Text("%s", localization::audio[localization_language_index_].c_str()); ImGui::TableNextColumn(); - BitrateDisplay((int)net_traffic_stats_.audio_in); + BitrateDisplay((int)net_traffic_stats_.audio_inbound_stats.bitrate); ImGui::TableNextColumn(); - BitrateDisplay((int)net_traffic_stats_.audio_out); + BitrateDisplay((int)net_traffic_stats_.audio_outbound_stats.bitrate); ImGui::TableNextRow(); ImGui::TableNextColumn(); ImGui::Text("%s", localization::data[localization_language_index_].c_str()); ImGui::TableNextColumn(); - BitrateDisplay((int)net_traffic_stats_.data_in); + BitrateDisplay((int)net_traffic_stats_.data_inbound_stats.bitrate); ImGui::TableNextColumn(); - BitrateDisplay((int)net_traffic_stats_.data_out); + BitrateDisplay((int)net_traffic_stats_.data_outbound_stats.bitrate); ImGui::TableNextRow(); ImGui::TableNextColumn(); ImGui::Text("%s", localization::total[localization_language_index_].c_str()); ImGui::TableNextColumn(); - BitrateDisplay((int)net_traffic_stats_.total_in); + BitrateDisplay((int)net_traffic_stats_.total_inbound_stats.bitrate); ImGui::TableNextColumn(); - BitrateDisplay((int)net_traffic_stats_.total_out); + BitrateDisplay((int)net_traffic_stats_.total_outbound_stats.bitrate); ImGui::EndTable(); } diff --git a/thirdparty/projectx b/thirdparty/projectx index 11d8406..daef6f1 160000 --- a/thirdparty/projectx +++ b/thirdparty/projectx @@ -1 +1 @@ -Subproject commit 11d84068a4bcc2329efa2a5e83ef9d536b8bbdcb +Subproject commit daef6f19dc24db59f144efdacbfcaa7ecd049568 diff --git a/xmake.lua b/xmake.lua index 4081fc0..2b60142 100644 --- a/xmake.lua +++ b/xmake.lua @@ -26,7 +26,7 @@ if is_os("windows") then add_links("Shell32", "windowsapp", "dwmapi", "User32", "kernel32", "SDL2-static", "SDL2main", "gdi32", "winmm", "setupapi", "version", "Imm32", "iphlpapi") - add_cxflags("/W4", "/WX") + add_cxflags("/WX") elseif is_os("linux") then add_requires("ffmpeg 5.1.2", {system = false}) add_syslinks("pthread", "dl")