From 4a549631e5ed235187597fdeef9b171d2de914ab Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Mon, 16 May 2011 13:56:22 +0000 Subject: [PATCH] Movie class - refactor time calculations. Make PCE_NTSC = PCE. Remove any 60.0 or 50.0 const ints in favor of the default case. Made a decision that time should be calculated based on the console framerate not the fps at which bizhawk will emulate. Thus SMS uses a ~60.1 fps --- BizHawk.MultiClient/movie/Movie.cs | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/BizHawk.MultiClient/movie/Movie.cs b/BizHawk.MultiClient/movie/Movie.cs index fcc44c918d..f49e870586 100644 --- a/BizHawk.MultiClient/movie/Movie.cs +++ b/BizHawk.MultiClient/movie/Movie.cs @@ -375,13 +375,9 @@ namespace BizHawk.MultiClient { //Should these be placed somewhere more accessible? Perhaps as a public dictionary object in MainForm? const double NES_PAL = 50.006977968268290849; const double NES_NTSC = (double)60.098813897440515532; - const double PCE_NTSC = (7159090.90909090 / 455 / 263); //~59.826 - const double SMS_PAL = 60.0; - const double SMS_NTSC = 50.0; - const double GEN = 60.0; - - //const double REAL_SMS_NTSC = (3579545 / 262.0 / 228.0); - //const double REAL_SMS_PAL = (3546893 / 313.0 / 228.0); + const double PCE = (7159090.90909090 / 455 / 263); //~59.826 + const double SMS_NTSC = (3579545 / 262.0 / 228.0); + const double SMS_PAL = (3546893 / 313.0 / 228.0); const double NGP = (6144000.0 / (515 * 198)); const double VBOY = (20000000 / (259 * 384 * 4)); //~50.273 const double LYNX = 59.8; @@ -411,10 +407,8 @@ namespace BizHawk.MultiClient else return frames / NES_NTSC; case "PCE": - return frames / PCE_NTSC; - case "GEN": - return frames / GEN; - + return frames / PCE; + //One Day! case "VBOY": return frames / VBOY;