tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2025-07-13 22:52:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

cpu module: Reuse getCpuFrequency of cpu_frequency module

Browse Source
This commit is contained in:
Mann mit Hut
2023-07-29 15:28:26 +02:00
parent dce6a98f38
commit c45f6681b3
6 changed files with 8 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/modules/cpu.hpp
View File

@ -23,9 +23,7 @@ class Cpu : public ALabel {
private:
double getCpuLoad();
std::tuple<std::vector<uint16_t>, std::string> getCpuUsage();
std::tuple<float, float, float> getCpuFrequency();
std::vector<std::tuple<size_t, size_t>> parseCpuinfo();
std::vector<float> parseCpuFrequencies();
std::vector<std::tuple<size_t, size_t>> prev_times_;

6
include/modules/cpu_frequency.hpp
View File

@ -20,9 +20,11 @@ class CpuFrequency : public ALabel {
virtual ~CpuFrequency() = default;
auto update() -> void override;
// This is a static member because it is also used by the cpu module.
static std::tuple<float, float, float> getCpuFrequency();
private:
std::tuple<float, float, float> getCpuFrequency();
std::vector<float> parseCpuFrequencies();
static std::vector<float> parseCpuFrequencies();
util::SleeperThread thread_;
};