piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove VI count limit on Movie playback

Browse Source
This commit is contained in:
Chris Burgener
2016-07-09 20:29:33 -04:00
parent 488847099f
commit d00c013339
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/Core/Core.cpp
View File

@ -901,13 +901,12 @@ void UpdateTitle()
std::string SFPS; std::string SFPS;
if (Movie::IsPlayingInput()) if (Movie::IsPlayingInput())
SFPS = StringFromFormat("VI: %u/%u - Input: %u/%u - FPS: %.0f - VPS: %.0f - %.0f%%", SFPS = StringFromFormat("Input: %u/%u - VI: %u - FPS: %.0f - VPS: %.0f - %.0f%%",
(u32)Movie::g_currentFrame, (u32)Movie::g_totalFrames, (u32)Movie::g_currentInputCount, (u32)Movie::g_totalInputCount,
(u32)Movie::g_currentInputCount, (u32)Movie::g_totalInputCount, FPS, (u32)Movie::g_currentFrame, FPS, VPS, Speed);
VPS, Speed);
else if (Movie::IsRecordingInput()) else if (Movie::IsRecordingInput())
SFPS = StringFromFormat("VI: %u - Input: %u - FPS: %.0f - VPS: %.0f - %.0f%%", SFPS = StringFromFormat("Input: %u - VI: %u - FPS: %.0f - VPS: %.0f - %.0f%%",
(u32)Movie::g_currentFrame, (u32)Movie::g_currentInputCount, FPS, VPS, (u32)Movie::g_currentInputCount, (u32)Movie::g_currentFrame, FPS, VPS,
Speed); Speed);
else else
{ {

8
Source/Core/Core/Movie.cpp
View File

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

4
Source/Core/VideoCommon/RenderBase.cpp
View File

@ -312,7 +312,9 @@ void Renderer::DrawDebugText()
{ {
final_cyan += StringFromFormat("Frame: %llu", (unsigned long long)Movie::g_currentFrame); final_cyan += StringFromFormat("Frame: %llu", (unsigned long long)Movie::g_currentFrame);
if (Movie::IsPlayingInput()) 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"; final_cyan += "\n";