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

CoreComm - make vsync fields into properties

This commit is contained in:
adelikat 2017-05-02 07:56:34 -05:00
parent 08be637131
commit e5f82bf329
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Emulation.Common/CoreComms.cs
View File

@ -21,8 +21,8 @@ namespace BizHawk.Emulation.Common
public double VsyncRate => VsyncNum / (double)VsyncDen; public double VsyncRate => VsyncNum / (double)VsyncDen;
public int VsyncNum = 60; public int VsyncNum { get; set; } = 60;
public int VsyncDen = 1; public int VsyncDen { get; set; } = 1;
// a core should set these if you wish to provide rom status information yourself. otherwise it will be calculated by the frontend in a way you may not like, using RomGame-related concepts. // a core should set these if you wish to provide rom status information yourself. otherwise it will be calculated by the frontend in a way you may not like, using RomGame-related concepts.
public string RomStatusAnnotation { get; set; } public string RomStatusAnnotation { get; set; }

28
BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs
View File

@ -1,6 +1,5 @@
using System; using System;
using BizHawk.Common;
using BizHawk.Common.NumberExtensions; using BizHawk.Common.NumberExtensions;
using BizHawk.Common.BufferExtensions; using BizHawk.Common.BufferExtensions;
@ -290,11 +289,11 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
_lagcount = 0; _lagcount = 0;
Cpu = new MOS6502X Cpu = new MOS6502X
{ {
ReadMemory = this.ReadMemory, ReadMemory = ReadMemory,
WriteMemory = this.WriteMemory, WriteMemory = WriteMemory,
PeekMemory = this.PeekMemory, PeekMemory = PeekMemory,
DummyReadMemory = this.ReadMemory, DummyReadMemory = ReadMemory,
OnExecFetch = this.ExecFetch OnExecFetch = ExecFetch
}; };
if (_game["PAL"]) if (_game["PAL"])
@ -312,7 +311,12 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
// dcfilter coefficent is from real observed hardware behavior: a latched "1" will fully decay by ~170 or so tia sound cycles // dcfilter coefficent is from real observed hardware behavior: a latched "1" will fully decay by ~170 or so tia sound cycles
_tia = new TIA(this, _pal, Settings.SECAMColors, CoreComm.VsyncRate > 55.0 ? 735 : 882); _tia = new TIA(this, _pal, Settings.SECAMColors, CoreComm.VsyncRate > 55.0 ? 735 : 882);
_tia.GetFrameRate(out CoreComm.VsyncNum, out CoreComm.VsyncDen);
int vsyncNum, vsyncDen;
_tia.GetFrameRate(out vsyncNum, out vsyncDen);
CoreComm.VsyncNum = vsyncNum;
CoreComm.VsyncDen = vsyncDen;
_dcfilter = new DCFilter(_tia, 256); _dcfilter = new DCFilter(_tia, 256);
@ -347,11 +351,11 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
Cpu = new MOS6502X Cpu = new MOS6502X
{ {
ReadMemory = this.ReadMemory, ReadMemory = ReadMemory,
WriteMemory = this.WriteMemory, WriteMemory = WriteMemory,
PeekMemory = this.PeekMemory, PeekMemory = PeekMemory,
DummyReadMemory = this.ReadMemory, DummyReadMemory = ReadMemory,
OnExecFetch = this.ExecFetch OnExecFetch = ExecFetch
}; };
_tia.Reset(); _tia.Reset();