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

sdl: tab cleanup

This commit is contained in:
punkrockguy318 2012-03-06 11:40:42 +00:00
parent b0c2758324
commit 28ee7f3a6f
2 changed files with 403 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/drivers/sdl/sdl-video.cpp
View File

@ -100,7 +100,6 @@ KillVideo()
s_IconSurface=0; s_IconSurface=0;
} }
// return failure if the video system was not initialized // return failure if the video system was not initialized
if(s_inited == 0) if(s_inited == 0)
return -1; return -1;
@ -159,7 +158,6 @@ InitVideo(FCEUGI *gi)
int error, flags = 0; int error, flags = 0;
int doublebuf, xstretch, ystretch, xres, yres; int doublebuf, xstretch, ystretch, xres, yres;
FCEUI_printf("Initializing video..."); FCEUI_printf("Initializing video...");
// load the relevant configuration variables // load the relevant configuration variables
@ -180,8 +178,6 @@ InitVideo(FCEUGI *gi)
FCEUI_GetCurrentVidSystem(&s_srendline, &s_erendline); FCEUI_GetCurrentVidSystem(&s_srendline, &s_erendline);
s_tlines = s_erendline - s_srendline + 1; s_tlines = s_erendline - s_srendline + 1;
// check for OpenGL and set the global flags // check for OpenGL and set the global flags
#if OPENGL #if OPENGL
if(s_useOpenGL && !s_sponge) { if(s_useOpenGL && !s_sponge) {
@ -232,7 +228,6 @@ InitVideo(FCEUGI *gi)
// gives the SDL exclusive palette control... ensures the requested colors // gives the SDL exclusive palette control... ensures the requested colors
flags |= SDL_HWPALETTE; flags |= SDL_HWPALETTE;
// enable double buffering if requested and we have hardware support // enable double buffering if requested and we have hardware support
#ifdef OPENGL #ifdef OPENGL
if(s_useOpenGL) { if(s_useOpenGL) {
@ -282,7 +277,6 @@ InitVideo(FCEUGI *gi)
g_config->getOption("SDL.XScale", &s_exs); g_config->getOption("SDL.XScale", &s_exs);
g_config->getOption("SDL.YScale", &s_eys); g_config->getOption("SDL.YScale", &s_eys);
} }
g_config->getOption("SDL.SpecialFX", &s_eefx); g_config->getOption("SDL.SpecialFX", &s_eefx);
#ifdef OPENGL #ifdef OPENGL
@ -495,8 +489,7 @@ InitVideo(FCEUGI *gi)
/** /**
* Toggles the full-screen display. * Toggles the full-screen display.
*/ */
void void ToggleFS()
ToggleFS()
{ {
// pause while we we are making the switch // pause while we we are making the switch
bool paused = FCEUI_EmulationPaused(); bool paused = FCEUI_EmulationPaused();
@ -566,8 +559,7 @@ FCEUD_GetPalette(uint8 index,
/** /**
* Pushes the palette structure into the underlying video subsystem. * Pushes the palette structure into the underlying video subsystem.
*/ */
static void static void RedoPalette()
RedoPalette()
{ {
#ifdef OPENGL #ifdef OPENGL
if(s_useOpenGL) if(s_useOpenGL)
@ -577,7 +569,8 @@ RedoPalette()
{ {
if(s_curbpp > 8) { if(s_curbpp > 8) {
SetPaletteBlitToHigh((uint8*)s_psdl); SetPaletteBlitToHigh((uint8*)s_psdl);
} else { } else
{
SDL_SetPalette(s_screen, SDL_PHYSPAL, s_psdl, 0, 256); SDL_SetPalette(s_screen, SDL_PHYSPAL, s_psdl, 0, 256);
} }
} }