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

minor code cleanup

This commit is contained in:
punkrockguy318 2013-03-16 04:23:02 +00:00
parent 59bd684493
commit bc5d937ca4
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
trunk/src/drivers/sdl/input.cpp
View File

@ -884,7 +884,6 @@ GetMouseData (uint32 (&d)[3])
// retrieve the state of the mouse from SDL // retrieve the state of the mouse from SDL
t = SDL_GetMouseState (&x, &y); t = SDL_GetMouseState (&x, &y);
SDL_Event event;
#ifdef _GTK #ifdef _GTK
if (noGui == 0) if (noGui == 0)
{ {
@ -963,10 +962,8 @@ static int bcpv, bcpj;
*/ */
int ButtonConfigBegin () int ButtonConfigBegin ()
{ {
SDL_Surface *screen; //dont shut down video subsystem if we are using gtk to prevent the sdl window from becoming detached to GTK window
// prg318 - 10-2-2011
//dont shut down video subsystem if we are using gtk to prevent the sdl window from becoming detached to GTK window
// prg318 - 10-2-2011
#ifdef _GTK #ifdef _GTK
int noGui; int noGui;
g_config->getOption ("SDL.NoGUI", &noGui); g_config->getOption ("SDL.NoGUI", &noGui);
@ -975,7 +972,6 @@ int ButtonConfigBegin ()
SDL_QuitSubSystem (SDL_INIT_VIDEO); SDL_QuitSubSystem (SDL_INIT_VIDEO);
bcpv = KillVideo (); bcpv = KillVideo ();
} }
#else #else
// XXX soules - why are we doing this right before KillVideo()? // XXX soules - why are we doing this right before KillVideo()?
SDL_QuitSubSystem (SDL_INIT_VIDEO); SDL_QuitSubSystem (SDL_INIT_VIDEO);
@ -983,6 +979,8 @@ int ButtonConfigBegin ()
// shut down the video and joystick subsystems // shut down the video and joystick subsystems
bcpv = KillVideo (); bcpv = KillVideo ();
#endif #endif
SDL_Surface *screen;
bcpj = KillJoysticks (); bcpj = KillJoysticks ();
// reactivate the video subsystem // reactivate the video subsystem
@ -1042,8 +1040,6 @@ int ButtonConfigBegin ()
void void
ButtonConfigEnd () ButtonConfigEnd ()
{ {
extern FCEUGI *GameInfo;
// shutdown the joystick and video subsystems // shutdown the joystick and video subsystems
KillJoysticks (); KillJoysticks ();
//SDL_QuitSubSystem(SDL_INIT_VIDEO); //SDL_QuitSubSystem(SDL_INIT_VIDEO);