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

SDL: fixed alt/shift bug i comitted a revision ago 

SDL: set sane defaults for sound; enable newPPU by default
This commit is contained in:
punkrockguy318 2010-02-23 02:49:39 +00:00
parent c6dca72ba9
commit 44c7b1ad17
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,16 +115,16 @@ InitConfig()
// sound options // sound options
config->addOption('s', "sound", "SDL.Sound", 1); config->addOption('s', "sound", "SDL.Sound", 1);
config->addOption("volume", "SDL.SoundVolume", 150); config->addOption("volume", "SDL.SoundVolume", 256);
config->addOption("trianglevol", "SDL.TriangleVolume", 256); config->addOption("trianglevol", "SDL.TriangleVolume", 256);
config->addOption("square1vol", "SDL.Square1Volume", 256); config->addOption("square1vol", "SDL.Square1Volume", 256);
config->addOption("square2vol", "SDL.Square2Volume", 256); config->addOption("square2vol", "SDL.Square2Volume", 256);
config->addOption("noisevol", "SDL.NoiseVolume", 256); config->addOption("noisevol", "SDL.NoiseVolume", 256);
config->addOption("pcmvol", "SDL.PCMVolume", 256); config->addOption("pcmvol", "SDL.PCMVolume", 256);
config->addOption("soundrate", "SDL.SoundRate", 11000); config->addOption("soundrate", "SDL.SoundRate", 44100);
config->addOption("soundq", "SDL.SoundQuality", 1); config->addOption("soundq", "SDL.SoundQuality", 1);
config->addOption("soundrecord", "SDL.SoundRecordFile", ""); config->addOption("soundrecord", "SDL.SoundRecordFile", "");
config->addOption("soundbufsize", "SDL.SoundBufSize", 48); config->addOption("soundbufsize", "SDL.SoundBufSize", 128);
// old EOptions // old EOptions
config->addOption('g', "gamegenie", "SDL.GameGenie", 0); config->addOption('g', "gamegenie", "SDL.GameGenie", 0);
@ -215,7 +215,7 @@ InitConfig()
config->addOption("ripsubs", "SDL.RipSubs", ""); config->addOption("ripsubs", "SDL.RipSubs", "");
// enable new PPU core // enable new PPU core
config->addOption("newppu", "SDL.NewPPU", 0); config->addOption("newppu", "SDL.NewPPU", 1);
// GamePad 0 - 3 // GamePad 0 - 3
for(unsigned int i = 0; i < GAMEPAD_NUM_DEVICES; i++) { for(unsigned int i = 0; i < GAMEPAD_NUM_DEVICES; i++) {

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

@ -423,11 +423,11 @@ KeyboardCommands()
} }
mod = SDL_GetModState(); mod = SDL_GetModState();
if(mod | KMOD_LSHIFT || mod | KMOD_RSHIFT) if(mod & (KMOD_LSHIFT|KMOD_RSHIFT))
is_shift = 1; is_shift = 1;
else else
is_shift = 0; is_shift = 0;
if(mod | KMOD_LALT || mod | KMOD_RALT) if(mod & (KMOD_LALT| KMOD_RALT))
is_alt = 1; is_alt = 1;
else else
is_alt = 0; is_alt = 0;