ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move some logic out of TasLagLog that belongs at the caller level

This commit is contained in:
adelikat 2020-05-24 19:56:29 -05:00
parent 43e796d256
commit 4e3ae130e2
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/BizHawk.Client.Common/movie/tasproj/TasLagLog.cs
View File

@ -2,7 +2,6 @@
using System.IO;
using System.Linq;
using Newtonsoft.Json;
using BizHawk.Emulation.Common;
namespace BizHawk.Client.Common
{
@ -16,18 +15,7 @@ namespace BizHawk.Client.Common
get
{
var result = _lagLog.TryGetValue(frame, out var lag);
if (result)
{
return lag;
}
// TODO: don't do this here, the calling code should decide if showing the current emulator state is the right decision
if (frame == Global.Emulator.Frame)
{
return Global.Emulator.AsInputPollable().IsLagFrame;
}
return null;
return result ? (bool?)lag : null;
}
set

25
src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
View File

@ -43,13 +43,26 @@ namespace BizHawk.Client.Common
public override string PreferredExtension => Extension;
public IStateManager TasStateManager { get; }
public ITasMovieRecord this[int index] => new TasMovieRecord
public ITasMovieRecord this[int index]
{
HasState = TasStateManager.HasState(index),
LogEntry = GetInputLogEntry(index),
Lagged = LagLog[index + 1],
WasLagged = LagLog.History(index + 1)
};
get
{
var lagIndex = index + 1;
var lagged = LagLog[lagIndex];
if (lagged == null && Global.Emulator.Frame == lagIndex)
{
lagged = Global.Emulator.AsInputPollable().IsLagFrame;
}
return new TasMovieRecord
{
HasState = TasStateManager.HasState(index),
LogEntry = GetInputLogEntry(index),
Lagged = lagged,
WasLagged = LagLog.History(lagIndex)
};
}
}
public override void StartNewRecording()
{