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

SDL: fixed compilation error without -DCREATE_AVI introduced in r1239

This commit is contained in:
shinydoofy 2009-03-29 13:20:10 +00:00
parent 35c026f234
commit ae53895a13
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/sdl/config.cpp
View File

@ -303,7 +303,9 @@ InitConfig()
config->addOption(prefix + "IncreaseSpeed", SDLK_EQUALS); config->addOption(prefix + "IncreaseSpeed", SDLK_EQUALS);
config->addOption(prefix + "FrameAdvance", SDLK_BACKSLASH); config->addOption(prefix + "FrameAdvance", SDLK_BACKSLASH);
config->addOption(prefix + "InputDisplay", SDLK_i); config->addOption(prefix + "InputDisplay", SDLK_i);
#ifdef CREATE_AVI
config->addOption(prefix + "MuteCapture", SDLK_DELETE); config->addOption(prefix + "MuteCapture", SDLK_DELETE);
#endif
config->addOption(prefix + "Quit", SDLK_ESCAPE); config->addOption(prefix + "Quit", SDLK_ESCAPE);
//config->addOption(prefix + "Power", 0); //config->addOption(prefix + "Power", 0);

6
src/drivers/sdl/input.cpp
View File

@ -168,7 +168,9 @@ int movieToggleFrameDisplayKey;
int lagCounterDisplayKey; int lagCounterDisplayKey;
int SubtitleDisplayKey; int SubtitleDisplayKey;
int InputDisplayKey; int InputDisplayKey;
#ifdef CREATE_AVI
int MuteCaptureKey; int MuteCaptureKey;
#endif
// this function loads the sdl hotkeys from the config file into the // this function loads the sdl hotkeys from the config file into the
// global scope. this elimates the need for accessing the config file // global scope. this elimates the need for accessing the config file
@ -206,7 +208,9 @@ void setHotKeys()
g_config->getOption("SDL.Hotkeys.MovieToggleFrameDisplay", &movieToggleFrameDisplayKey); g_config->getOption("SDL.Hotkeys.MovieToggleFrameDisplay", &movieToggleFrameDisplayKey);
g_config->getOption("SDL.Hotkeys.SubtitleDisplay", &SubtitleDisplayKey); g_config->getOption("SDL.Hotkeys.SubtitleDisplay", &SubtitleDisplayKey);
g_config->getOption("SDL.Hotkeys.InputDisplay", &InputDisplayKey); g_config->getOption("SDL.Hotkeys.InputDisplay", &InputDisplayKey);
#ifdef CREATE_AVI
g_config->getOption("SDL.Hotkeys.MuteCapture", &MuteCaptureKey); g_config->getOption("SDL.Hotkeys.MuteCapture", &MuteCaptureKey);
#endif
/* /*
config->addOption(prefix + "FrameAdvance", SDLK_BACKSLASH); config->addOption(prefix + "FrameAdvance", SDLK_BACKSLASH);
config->addOption(prefix + "Power", 0); config->addOption(prefix + "Power", 0);
@ -419,10 +423,12 @@ KeyboardCommands()
g_config->setOption("SDL.InputDisplay", input_display); g_config->setOption("SDL.InputDisplay", input_display);
} }
#ifdef CREATE_AVI
if(_keyonly(MuteCaptureKey)) { if(_keyonly(MuteCaptureKey)) {
extern int mutecapture; extern int mutecapture;
mutecapture ^= 1; mutecapture ^= 1;
} }
#endif
if(_keyonly(pauseKey)) { if(_keyonly(pauseKey)) {
FCEUI_ToggleEmulationPause(); FCEUI_ToggleEmulationPause();