Merge pull request #3995 from RisingFog/remove_vi_movie_playback

Remove VI count limit on Movie playback
dolphin-emu · Jul 10, 2016 · 6204a81 · 6204a81
2 parents bdec0d5 + d00c013
commit 6204a81
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
@@ -901,13 +901,12 @@ void UpdateTitle()
   std::string SFPS;
 
   if (Movie::IsPlayingInput())
-    SFPS = StringFromFormat("VI: %u/%u - Input: %u/%u - FPS: %.0f - VPS: %.0f - %.0f%%",
-                            (u32)Movie::g_currentFrame, (u32)Movie::g_totalFrames,
-                            (u32)Movie::g_currentInputCount, (u32)Movie::g_totalInputCount, FPS,
-                            VPS, Speed);
+    SFPS = StringFromFormat("Input: %u/%u - VI: %u - FPS: %.0f - VPS: %.0f - %.0f%%",
+                            (u32)Movie::g_currentInputCount, (u32)Movie::g_totalInputCount,
+                            (u32)Movie::g_currentFrame, FPS, VPS, Speed);
   else if (Movie::IsRecordingInput())
-    SFPS = StringFromFormat("VI: %u - Input: %u - FPS: %.0f - VPS: %.0f - %.0f%%",
-                            (u32)Movie::g_currentFrame, (u32)Movie::g_currentInputCount, FPS, VPS,
+    SFPS = StringFromFormat("Input: %u - VI: %u - FPS: %.0f - VPS: %.0f - %.0f%%",
+                            (u32)Movie::g_currentInputCount, (u32)Movie::g_currentFrame, FPS, VPS,
                             Speed);
   else
   {

diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp
@@ -1035,10 +1035,10 @@ void LoadInput(const std::string& filename)
     {
       afterEnd = true;
       PanicAlertT("Warning: You loaded a save that's after the end of the current movie. (byte %u "
-                  "> %u) (frame %u > %u). You should load another save before continuing, or load "
+                  "> %u) (input %u > %u). You should load another save before continuing, or load "
                   "this state with read-only mode off.",
-                  (u32)s_currentByte + 256, (u32)s_totalBytes + 256, (u32)g_currentFrame,
-                  (u32)g_totalFrames);
+                  (u32)s_currentByte + 256, (u32)s_totalBytes + 256, (u32)g_currentInputCount,
+                  (u32)g_totalInputCount);
     }
     else if (s_currentByte > 0 && s_totalBytes > 0)
     {
@@ -1134,7 +1134,7 @@ void LoadInput(const std::string& filename)
 // NOTE: CPU Thread
 static void CheckInputEnd()
 {
-  if (g_currentFrame > g_totalFrames || s_currentByte >= s_totalBytes ||
+  if (s_currentByte >= s_totalBytes ||
       (CoreTiming::GetTicks() > s_totalTickCount && !IsRecordingInputFromSaveState()))
   {
     EndPlayInput(!s_bReadOnly);

diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp
@@ -312,7 +312,9 @@ void Renderer::DrawDebugText()
     {
       final_cyan += StringFromFormat("Frame: %llu", (unsigned long long)Movie::g_currentFrame);
       if (Movie::IsPlayingInput())
-        final_cyan += StringFromFormat(" / %llu", (unsigned long long)Movie::g_totalFrames);
+        final_cyan +=
+            StringFromFormat("\nInput: %llu / %llu", (unsigned long long)Movie::g_currentInputCount,
+                             (unsigned long long)Movie::g_totalInputCount);
     }
 
     final_cyan += "\n";