diff --git a/src/BizHawk.Client.Common/Api/Classes/EmulationApi.cs b/src/BizHawk.Client.Common/Api/Classes/EmulationApi.cs index 0483759ac7..7ae6b0e335 100644 --- a/src/BizHawk.Client.Common/Api/Classes/EmulationApi.cs +++ b/src/BizHawk.Client.Common/Api/Classes/EmulationApi.cs @@ -56,12 +56,8 @@ namespace BizHawk.Client.Common } } - public Action FrameAdvanceCallback { get; set; } - public bool ForbiddenConfigReferenceUsed { get; private set; } - public Action YieldCallback { get; set; } - public EmulationApi(Action logCallback, Config config, IGameInfo game) { _config = config; @@ -71,8 +67,6 @@ namespace BizHawk.Client.Common public void DisplayVsync(bool enabled) => _config.VSync = enabled; - public void FrameAdvance() => FrameAdvanceCallback(); - public int FrameCount() => Emulator.Frame; public object Disassemble(uint pc, string name = "") @@ -184,8 +178,6 @@ namespace BizHawk.Client.Common public void MinimizeFrameskip(bool enabled) => _config.AutoMinimizeSkipping = enabled; - public void Yield() => YieldCallback(); - public string GetDisplayType() => (RegionableCore?.Region)?.ToString() ?? ""; public string GetBoardName() => BoardInfo?.BoardName ?? ""; diff --git a/src/BizHawk.Client.Common/Api/Interfaces/IEmulationApi.cs b/src/BizHawk.Client.Common/Api/Interfaces/IEmulationApi.cs index 437e35eead..f2eb833f49 100644 --- a/src/BizHawk.Client.Common/Api/Interfaces/IEmulationApi.cs +++ b/src/BizHawk.Client.Common/Api/Interfaces/IEmulationApi.cs @@ -1,15 +1,12 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; + using BizHawk.Emulation.Common; namespace BizHawk.Client.Common { public interface IEmulationApi : IExternalApi { - Action FrameAdvanceCallback { get; set; } - Action YieldCallback { get; set; } void DisplayVsync(bool enabled); - void FrameAdvance(); int FrameCount(); object Disassemble(uint pc, string name = ""); ulong? GetRegister(string name); @@ -23,7 +20,6 @@ namespace BizHawk.Client.Common void SetLagCount(int count); void LimitFramerate(bool enabled); void MinimizeFrameskip(bool enabled); - void Yield(); string GetDisplayType(); string GetBoardName(); object GetSettings();