From 95b7b44b6ff9057d56321cd05051dc81212d276d Mon Sep 17 00:00:00 2001 From: jackun Date: Mon, 24 Apr 2023 22:11:00 +0300 Subject: [PATCH] Nuke `io_stats`, `io_read/write` params are enough --- data/MangoHud.conf | 1 - src/hud_elements.cpp | 9 +++++++-- src/overlay_params.cpp | 1 - src/overlay_params.h | 1 - 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/data/MangoHud.conf b/data/MangoHud.conf index ff164e5b..fb9a9f89 100644 --- a/data/MangoHud.conf +++ b/data/MangoHud.conf @@ -81,7 +81,6 @@ cpu_stats # core_load_change ### Display IO read and write for the app (not system) -# io_stats # io_read # io_write diff --git a/src/hud_elements.cpp b/src/hud_elements.cpp index 4519d44e..1e35dea4 100644 --- a/src/hud_elements.cpp +++ b/src/hud_elements.cpp @@ -1136,7 +1136,12 @@ void HudElements::sort_elements(const std::pair& optio if (param == "gpu_stats") { ordered_functions.push_back({gpu_stats, value}); } if (param == "cpu_stats") { ordered_functions.push_back({cpu_stats, value}); } if (param == "core_load") { ordered_functions.push_back({core_load, value}); } - if (param == "io_stats") { ordered_functions.push_back({io_stats, value}); } + if (param == "io_read" || param == "io_write") { + // Don't add twice + if (std::find_if(ordered_functions.begin(), ordered_functions.end(), [](const auto& a) -> bool { return a.first == io_stats; }) != ordered_functions.end()) + return; + ordered_functions.push_back({io_stats, value}); + } if (param == "arch") { ordered_functions.push_back({arch, value}); } if (param == "wine") { ordered_functions.push_back({wine, value}); } if (param == "procmem") { ordered_functions.push_back({procmem, value}); } @@ -1194,7 +1199,7 @@ void HudElements::legacy_elements(){ ordered_functions.push_back({cpu_stats, value}); if (params->enabled[OVERLAY_PARAM_ENABLED_core_load]) ordered_functions.push_back({core_load, value}); - if (params->enabled[OVERLAY_PARAM_ENABLED_io_stats]) + if (params->enabled[OVERLAY_PARAM_ENABLED_io_read] || params->enabled[OVERLAY_PARAM_ENABLED_io_write]) ordered_functions.push_back({io_stats, value}); if (params->enabled[OVERLAY_PARAM_ENABLED_vram]) ordered_functions.push_back({vram, value}); diff --git a/src/overlay_params.cpp b/src/overlay_params.cpp index 16042ba0..73e4688b 100644 --- a/src/overlay_params.cpp +++ b/src/overlay_params.cpp @@ -601,7 +601,6 @@ parse_overlay_config(struct overlay_params *params, params->enabled[OVERLAY_PARAM_ENABLED_read_cfg] = false; params->enabled[OVERLAY_PARAM_ENABLED_io_read] = false; params->enabled[OVERLAY_PARAM_ENABLED_io_write] = false; - params->enabled[OVERLAY_PARAM_ENABLED_io_stats] = false; params->enabled[OVERLAY_PARAM_ENABLED_wine] = false; params->enabled[OVERLAY_PARAM_ENABLED_gpu_load_change] = false; params->enabled[OVERLAY_PARAM_ENABLED_cpu_load_change] = false; diff --git a/src/overlay_params.h b/src/overlay_params.h index b3c69362..87ab3c1f 100644 --- a/src/overlay_params.h +++ b/src/overlay_params.h @@ -46,7 +46,6 @@ typedef unsigned long KeySym; OVERLAY_PARAM_BOOL(read_cfg) \ OVERLAY_PARAM_BOOL(io_read) \ OVERLAY_PARAM_BOOL(io_write) \ - OVERLAY_PARAM_BOOL(io_stats) \ OVERLAY_PARAM_BOOL(gpu_mem_clock) \ OVERLAY_PARAM_BOOL(gpu_core_clock) \ OVERLAY_PARAM_BOOL(gpu_power) \