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

get ICycleTiming from service provider 

fixes 87209aa11b
This commit is contained in:
CasualPokePlayer 2024-06-16 21:27:05 -07:00
parent 87209aa11b
commit a9c04524c7
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs
View File

@ -295,7 +295,7 @@ namespace BizHawk.Client.Common
movie.HeaderEntries.Add(HeaderKeys.VsyncAttoseconds, mame.VsyncAttoseconds.ToString());
}
if (emulator is ICycleTiming)
if (emulator.HasCycleTiming())
{
movie.HeaderEntries.Add(HeaderKeys.CycleCount, "0");
movie.HeaderEntries.Add(HeaderKeys.ClockRate, "0");

8
src/BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -342,12 +342,12 @@ namespace BizHawk.Client.Common
private void HandlePlaybackEnd()
{
if (Movie.IsAtEnd() && (Movie.Emulator is ICycleTiming cycleCore))
if (Movie.IsAtEnd() && Movie.Emulator.HasCycleTiming())
{
long coreValue = cycleCore.CycleCount;
bool movieHasValue = Movie.HeaderEntries.TryGetValue(HeaderKeys.CycleCount, out string movieValueStr);
var coreValue = Movie.Emulator.AsCycleTiming().CycleCount;
var movieHasValue = Movie.HeaderEntries.TryGetValue(HeaderKeys.CycleCount, out var movieValueStr);
long movieValue = movieHasValue ? Convert.ToInt64(movieValueStr) : 0;
var movieValue = movieHasValue ? Convert.ToInt64(movieValueStr) : 0;
var valuesMatch = movieValue == coreValue;
if (!movieHasValue || !valuesMatch)

3
src/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs
View File

@ -54,7 +54,8 @@ namespace BizHawk.Client.Common
// The saved cycle value will only be valid if the end of the movie has been emulated.
if (this.IsAtEnd())
{
if (Emulator is ICycleTiming cycleCore)
var cycleCore = Emulator.AsCycleTiming();
if (cycleCore != null)
{
Header[HeaderKeys.CycleCount] = cycleCore.CycleCount.ToString();
Header[HeaderKeys.ClockRate] = cycleCore.ClockRate.ToString(CultureInfo.InvariantCulture);

6
src/BizHawk.Emulation.Common/Extensions.cs
View File

@ -354,6 +354,12 @@ namespace BizHawk.Emulation.Common
return core.VsyncNumerator() / (double)core.VsyncDenominator();
}
public static bool HasCycleTiming(this IEmulator core)
=> core != null && core.ServiceProvider.HasService<ICycleTiming>();
public static ICycleTiming AsCycleTiming(this IEmulator core)
=> core.ServiceProvider.GetService<ICycleTiming>();
public static bool IsImplemented(this MethodInfo info)
{
return !info.GetCustomAttributes(false).Any(a => a is FeatureNotImplementedAttribute);