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

Display Hz in console time.

This commit is contained in:
Christian Speckner 2018-07-31 00:07:07 +02:00
parent 81f216872d
commit 6da398deaa
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emucore/Console.cxx
View File

@ -978,7 +978,7 @@ void Console::generateColorLossPalette()
float Console::getFramerate() const float Console::getFramerate() const
{ {
return return
static_cast<float>(myEmulationTiming.linesPerSecond()) / myTIA->frameBufferScanlinesLastFrame(); (myConsoleTiming == ConsoleTiming::ntsc ? 262. * 60. : 312. * 50.) / myTIA->frameBufferScanlinesLastFrame();
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

8
src/emucore/EmulationTiming.cxx
View File

@ -134,12 +134,6 @@ uInt32 EmulationTiming::cyclesPerSecond() const
return myCyclesPerSecond; return myCyclesPerSecond;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt32 EmulationTiming::linesPerSecond() const
{
return myLinesPerSecond;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt32 EmulationTiming::audioFragmentSize() const uInt32 EmulationTiming::audioFragmentSize() const
{ {
@ -210,6 +204,4 @@ void EmulationTiming::recalculate()
myPrebufferFragmentCount, myPrebufferFragmentCount,
discreteDivCeil(myMaxCyclesPerTimeslice * myAudioSampleRate, myAudioFragmentSize * myCyclesPerSecond) discreteDivCeil(myMaxCyclesPerTimeslice * myAudioSampleRate, myAudioFragmentSize * myCyclesPerSecond)
) + myAudioQueueExtraFragments; ) + myAudioQueueExtraFragments;
myLinesPerSecond = myCyclesPerSecond / 76;
} }

2
src/emucore/EmulationTiming.hxx
View File

@ -49,8 +49,6 @@ class EmulationTiming {
uInt32 cyclesPerFrame() const; uInt32 cyclesPerFrame() const;
uInt32 linesPerSecond() const;
uInt32 cyclesPerSecond() const; uInt32 cyclesPerSecond() const;
uInt32 audioFragmentSize() const; uInt32 audioFragmentSize() const;