From 53ca2ec27479f3c0228b3d53f8e0b5d1424c7ae0 Mon Sep 17 00:00:00 2001 From: sowens99 Date: Tue, 28 Sep 2021 22:15:25 -0400 Subject: [PATCH] RenderBase: show total framecount on movie playback Previously, when playing back a movie, you could not see the total frame count of a movie, only the total number of input polls. This change simply shows the total frame count on movie playback. Note that this change also results in the framecount and framecount total ALWAYS being displayed if show_movie_window is true, regardless of whether or not m_ShowFrameCount is true. I believe this is fine, as TASers are much more likely to reference the framecount than the input poll count. --- Source/Core/VideoCommon/RenderBase.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 07fa239bba..22916816eb 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -559,15 +559,17 @@ void Renderer::DrawDebugText() ImGui::GetIO().DisplaySize); if (ImGui::Begin("Movie", nullptr, ImGuiWindowFlags_NoFocusOnAppearing)) { - if (config.m_ShowFrameCount) - { - ImGui::Text("Frame: %" PRIu64, Movie::GetCurrentFrame()); - } if (Movie::IsPlayingInput()) { + ImGui::Text("Frame: %" PRIu64 " / %" PRIu64, Movie::GetCurrentFrame(), + Movie::GetTotalFrames()); ImGui::Text("Input: %" PRIu64 " / %" PRIu64, Movie::GetCurrentInputCount(), Movie::GetTotalInputCount()); } + else if (config.m_ShowFrameCount) + { + ImGui::Text("Frame: %" PRIu64, Movie::GetCurrentFrame()); + } if (SConfig::GetInstance().m_ShowLag) ImGui::Text("Lag: %" PRIu64 "\n", Movie::GetCurrentLagCount()); if (SConfig::GetInstance().m_ShowInputDisplay)