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

Compile fix, more accurate timing.

This commit is contained in:
Christian Speckner 2018-07-02 00:23:07 +02:00
parent c270a45409
commit 621e0d9d79
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/emucore/EmulationTiming.cxx
View File

@ -118,12 +118,6 @@ uInt32 EmulationTiming::cyclesPerFrame() const
return myCyclesPerFrame; return myCyclesPerFrame;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt32 EmulationTiming::framesPerSecond() const
{
return myFramesPerSecond;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt32 EmulationTiming::cyclesPerSecond() const uInt32 EmulationTiming::cyclesPerSecond() const
{ {
@ -170,13 +164,14 @@ void EmulationTiming::recalculate()
throw runtime_error("invalid frame layout"); throw runtime_error("invalid frame layout");
} }
switch (myFrameLayout) { float framesPerSecond;
switch (myFrameLayout) {
case FrameLayout::ntsc: case FrameLayout::ntsc:
myFramesPerSecond = round(mySpeedFactor * 60); framesPerSecond = mySpeedFactor * 60;
break; break;
case FrameLayout::pal: case FrameLayout::pal:
myFramesPerSecond = round(mySpeedFactor * 50); framesPerSecond = mySpeedFactor * 50;
break; break;
default: default:
@ -186,9 +181,9 @@ void EmulationTiming::recalculate()
myCyclesPerFrame = 76 * myLinesPerFrame; myCyclesPerFrame = 76 * myLinesPerFrame;
myMaxCyclesPerTimeslice = round(mySpeedFactor * myCyclesPerFrame * 2); myMaxCyclesPerTimeslice = round(mySpeedFactor * myCyclesPerFrame * 2);
myMinCyclesPerTimeslice = round(mySpeedFactor * myCyclesPerFrame / 2); myMinCyclesPerTimeslice = round(mySpeedFactor * myCyclesPerFrame / 2);
myCyclesPerSecond = myCyclesPerFrame * myFramesPerSecond; myCyclesPerSecond = (round(myCyclesPerFrame * framesPerSecond) / 38) * 38;
myAudioFragmentSize = round(mySpeedFactor * AUDIO_HALF_FRAMES_PER_FRAGMENT * myLinesPerFrame); myAudioFragmentSize = round(mySpeedFactor * AUDIO_HALF_FRAMES_PER_FRAGMENT * myLinesPerFrame);
myAudioSampleRate = 2 * myLinesPerFrame * myFramesPerSecond; myAudioSampleRate = myCyclesPerSecond / 38;
myPrebufferFragmentCount = discreteDivCeil( myPrebufferFragmentCount = discreteDivCeil(
myPlaybackPeriod * myAudioSampleRate, myPlaybackPeriod * myAudioSampleRate,

3
src/emucore/EmulationTiming.hxx
View File

@ -46,8 +46,6 @@ class EmulationTiming {
uInt32 cyclesPerFrame() const; uInt32 cyclesPerFrame() const;
uInt32 framesPerSecond() const;
uInt32 cyclesPerSecond() const; uInt32 cyclesPerSecond() const;
uInt32 audioFragmentSize() const; uInt32 audioFragmentSize() const;
@ -75,7 +73,6 @@ class EmulationTiming {
uInt32 myMinCyclesPerTimeslice; uInt32 myMinCyclesPerTimeslice;
uInt32 myLinesPerFrame; uInt32 myLinesPerFrame;
uInt32 myCyclesPerFrame; uInt32 myCyclesPerFrame;
uInt32 myFramesPerSecond;
uInt32 myCyclesPerSecond; uInt32 myCyclesPerSecond;
uInt32 myAudioFragmentSize; uInt32 myAudioFragmentSize;
uInt32 myAudioSampleRate; uInt32 myAudioSampleRate;

1
src/gui/Dialog.cxx
View File

@ -34,6 +34,7 @@
#include "Console.hxx" #include "Console.hxx"
#include "Vec.hxx" #include "Vec.hxx"
#include "TIA.hxx"
/* /*
* TODO list * TODO list