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

myNTSC removed, defined by number of scanlines now

This commit is contained in:
thrust26 2017-11-15 11:03:39 +01:00
parent 632fffcb49
commit 838b277c0a
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/RewindManager.cxx
View File

@ -28,8 +28,7 @@ static int count = 1;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
RewindManager::RewindManager(OSystem& system, StateManager& statemgr) RewindManager::RewindManager(OSystem& system, StateManager& statemgr)
: myOSystem(system), : myOSystem(system),
myStateManager(statemgr), myStateManager(statemgr)
myIsNTSC(true) // TODO
{ {
} }
@ -186,11 +185,12 @@ string RewindManager::getMessage(RewindState& state)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string RewindManager::getUnitString(Int64 cycles) string RewindManager::getUnitString(Int64 cycles)
{ {
const uInt64 scanlines = myOSystem.console().tia().scanlinesLastFrame();
const bool isNTSC = scanlines <= 285; // TODO: replace magic number
const uInt64 NTSC_FREQ = 1193182; // ~76*262*60 const uInt64 NTSC_FREQ = 1193182; // ~76*262*60
const uInt64 PAL_FREQ = 1182298; // ~76*312*50 const uInt64 PAL_FREQ = 1182298; // ~76*312*50
const uInt64 freq = myIsNTSC ? NTSC_FREQ : PAL_FREQ; // = cycles/second const uInt64 freq = isNTSC ? NTSC_FREQ : PAL_FREQ; // = cycles/second
const uInt64 scanlines = myIsNTSC ? 262 : 312; // TODO: use actual number of scanlines
//const uInt64 fps = myIsNTSC ? 60 : 50; // TODO: use actual FPS
string unit; string unit;
Int64 diffUnit; Int64 diffUnit;
stringstream result; stringstream result;

2
src/common/RewindManager.hxx
View File

@ -97,8 +97,6 @@ class RewindManager
// frequent (de)-allocations) // frequent (de)-allocations)
Common::LinkedObjectPool<RewindState, MAX_SIZE> myStateList; Common::LinkedObjectPool<RewindState, MAX_SIZE> myStateList;
bool myIsNTSC;
void compressStates(); void compressStates();
string getMessage(RewindState& state); string getMessage(RewindState& state);