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

Make SoundSync mutually exclusive with DynamicRateControl in GTK+ port. Disable S9xContinueUpdate.

This commit is contained in:
Brandon Wright 2017-11-27 12:11:49 -06:00
parent 4dc09dac2d
commit 63394cd26a
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/src/gtk_display.cpp
View File

@ -1901,7 +1901,6 @@ S9xReinitDisplay (void)
bool8 bool8
S9xContinueUpdate (int width, int height) S9xContinueUpdate (int width, int height)
{ {
S9xDeinitUpdate (width, height);
return TRUE; return TRUE;
} }

6
gtk/src/gtk_s9x.cpp
View File

@ -503,7 +503,7 @@ S9xSyncSpeedFinish (void)
gettimeofday (&now, NULL); gettimeofday (&now, NULL);
if (Settings.SoundSync) if (Settings.SoundSync && !Settings.DynamicRateControl)
{ {
while (!S9xSyncSound ()) while (!S9xSyncSound ())
{ {
@ -611,7 +611,7 @@ S9xSyncSpeed (void)
++next_frame_time.tv_usec; ++next_frame_time.tv_usec;
} }
if (Settings.SkipFrames == AUTO_FRAMERATE && !Settings.SoundSync) if (Settings.SkipFrames == AUTO_FRAMERATE && (!Settings.SoundSync || Settings.DynamicRateControl))
{ {
lag = TIMER_DIFF (now, next_frame_time); lag = TIMER_DIFF (now, next_frame_time);
@ -641,7 +641,7 @@ S9xSyncSpeed (void)
} }
else else
{ {
limit = Settings.SoundSync ? 1 : Settings.SkipFrames + 1; limit = (Settings.SoundSync && !Settings.DynamicRateControl) ? 1 : Settings.SkipFrames + 1;
IPPU.SkippedFrames++; IPPU.SkippedFrames++;
IPPU.RenderThisFrame = 0; IPPU.RenderThisFrame = 0;