diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2022-07-17 20:43:47 -0700 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2022-08-02 22:24:06 -0700 |
| commit | 09089eeee0bf6022cc7681214e51546d134402ea (patch) | |
| tree | 8a209216e224f8a28c1217459769efba6499a2fb /Source/Core/VideoCommon/OnScreenDisplay.cpp | |
| parent | 8d16971a6fcd3534c9dd34d625c151d2a5ce3ed9 (diff) | |
Common::Timer: use chrono::steady_clock internally
Diffstat (limited to 'Source/Core/VideoCommon/OnScreenDisplay.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/OnScreenDisplay.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/VideoCommon/OnScreenDisplay.cpp b/Source/Core/VideoCommon/OnScreenDisplay.cpp index 4bc7cd9494..d2c211c861 100644 --- a/Source/Core/VideoCommon/OnScreenDisplay.cpp +++ b/Source/Core/VideoCommon/OnScreenDisplay.cpp @@ -32,12 +32,12 @@ static std::atomic<int> s_obscured_pixels_top = 0; struct Message { Message() = default; - Message(std::string text_, u32 timestamp_, u32 duration_, u32 color_) + Message(std::string text_, u64 timestamp_, u32 duration_, u32 color_) : text(std::move(text_)), timestamp(timestamp_), duration(duration_), color(color_) { } std::string text; - u32 timestamp = 0; + u64 timestamp = 0; u32 duration = 0; bool ever_drawn = false; u32 color = 0; @@ -93,20 +93,20 @@ void AddTypedMessage(MessageType type, std::string message, u32 ms, u32 argb) { std::lock_guard lock{s_messages_mutex}; s_messages.erase(type); - s_messages.emplace(type, Message(std::move(message), Common::Timer::GetTimeMs() + ms, ms, argb)); + s_messages.emplace(type, Message(std::move(message), Common::Timer::NowMs() + ms, ms, argb)); } void AddMessage(std::string message, u32 ms, u32 argb) { std::lock_guard lock{s_messages_mutex}; s_messages.emplace(MessageType::Typeless, - Message(std::move(message), Common::Timer::GetTimeMs() + ms, ms, argb)); + Message(std::move(message), Common::Timer::NowMs() + ms, ms, argb)); } void DrawMessages() { const bool draw_messages = Config::Get(Config::MAIN_OSD_MESSAGES); - const u32 now = Common::Timer::GetTimeMs(); + const u64 now = Common::Timer::NowMs(); const float current_x = LEFT_MARGIN * ImGui::GetIO().DisplayFramebufferScale.x + s_obscured_pixels_left; float current_y = TOP_MARGIN * ImGui::GetIO().DisplayFramebufferScale.y + s_obscured_pixels_top; |
