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

This was apparently not used anymore.

This commit is contained in:
bgk 2009-01-01 15:24:31 +00:00
parent ba89436ad2
commit a9370648df
3 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/System.h
View File

@ -85,7 +85,6 @@ extern int systemVerbose;
extern int systemFrameSkip; extern int systemFrameSkip;
extern int systemSaveUpdateCounter; extern int systemSaveUpdateCounter;
extern int systemSpeed; extern int systemSpeed;
extern int systemThrottle;
#define SYSTEM_SAVE_UPDATED 30 #define SYSTEM_SAVE_UPDATED 30
#define SYSTEM_SAVE_NOT_UPDATED 0 #define SYSTEM_SAVE_NOT_UPDATED 0

1
src/gtk/system.cpp
View File

@ -35,7 +35,6 @@ int systemFrameSkip;
u32 systemColorMap32[0x10000]; u32 systemColorMap32[0x10000];
u16 systemColorMap16[0x10000]; u16 systemColorMap16[0x10000];
u16 systemGbPalette[24]; u16 systemGbPalette[24];
int systemThrottle = 0;
int emulating; int emulating;
int RGB_LOW_BITS_MASK; int RGB_LOW_BITS_MASK;

29
src/sdl/SDL.cpp
View File

@ -116,7 +116,6 @@ int systemDebug = 0;
int systemVerbose = 0; int systemVerbose = 0;
int systemFrameSkip = 0; int systemFrameSkip = 0;
int systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; int systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED;
int systemThrottle = 0;
int srcPitch = 0; int srcPitch = 0;
int srcWidth = 0; int srcWidth = 0;
@ -271,7 +270,6 @@ struct option sdlOptions[] = {
{ "no-pause-when-inactive", no_argument, &pauseWhenInactive, 0 }, { "no-pause-when-inactive", no_argument, &pauseWhenInactive, 0 },
{ "no-rtc", no_argument, &sdlRtcEnable, 0 }, { "no-rtc", no_argument, &sdlRtcEnable, 0 },
{ "no-show-speed", no_argument, &showSpeed, 0 }, { "no-show-speed", no_argument, &showSpeed, 0 },
{ "no-throttle", no_argument, &systemThrottle, 0 },
{ "opengl", required_argument, 0, 'O' }, { "opengl", required_argument, 0, 'O' },
{ "opengl-nearest", no_argument, &openGL, 1 }, { "opengl-nearest", no_argument, &openGL, 1 },
{ "opengl-bilinear", no_argument, &openGL, 2 }, { "opengl-bilinear", no_argument, &openGL, 2 },
@ -779,10 +777,6 @@ void sdlReadPreferences(FILE *f)
showSpeedTransparent = sdlFromHex(value); showSpeedTransparent = sdlFromHex(value);
} else if(!strcmp(key, "autoFrameSkip")) { } else if(!strcmp(key, "autoFrameSkip")) {
autoFrameSkip = sdlFromHex(value); autoFrameSkip = sdlFromHex(value);
} else if(!strcmp(key, "throttle")) {
systemThrottle = sdlFromHex(value);
if(systemThrottle != 0 && (systemThrottle < 5 || systemThrottle > 1000))
systemThrottle = 0;
} else if(!strcmp(key, "pauseWhenInactive")) { } else if(!strcmp(key, "pauseWhenInactive")) {
pauseWhenInactive = sdlFromHex(value) ? true : false; pauseWhenInactive = sdlFromHex(value) ? true : false;
} else if(!strcmp(key, "agbPrint")) { } else if(!strcmp(key, "agbPrint")) {
@ -2044,14 +2038,6 @@ int main(int argc, char **argv)
cpuSaveType = a; cpuSaveType = a;
} }
break; break;
case 'T':
if(optarg) {
int t = atoi(optarg);
if(t < 5 || t > 1000)
t = 0;
systemThrottle = t;
}
break;
case 'v': case 'v':
if(optarg) { if(optarg) {
systemVerbose = atoi(optarg); systemVerbose = atoi(optarg);
@ -2529,7 +2515,7 @@ void systemFrame()
void system10Frames(int rate) void system10Frames(int rate)
{ {
u32 time = systemGetClock(); u32 time = systemGetClock();
if(!wasPaused && autoFrameSkip && !systemThrottle) { if(!wasPaused && autoFrameSkip) {
u32 diff = time - autoFrameSkipLastTime; u32 diff = time - autoFrameSkipLastTime;
int speed = 100; int speed = 100;
@ -2557,19 +2543,6 @@ void system10Frames(int rate)
} }
} }
} }
if(!wasPaused && systemThrottle) {
if(!speedup) {
u32 diff = time - throttleLastTime;
int target = (1000000/(rate*systemThrottle));
int d = (target - diff);
if(d > 0) {
SDL_Delay(d);
}
}
throttleLastTime = systemGetClock();
}
if(rewindMemory) { if(rewindMemory) {
if(++rewindCounter >= rewindTimer) { if(++rewindCounter >= rewindTimer) {
rewindSaveNeeded = true; rewindSaveNeeded = true;