diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp index fc73a858..c0d9222a 100644 --- a/src/gui/sdlmain.cpp +++ b/src/gui/sdlmain.cpp @@ -19,7 +19,6 @@ #include #include #include -#include #include "dosbox.h" #include "video.h" @@ -33,7 +32,6 @@ //#define DISABLE_JOYSTICK - struct SDL_Block { bool active; //If this isn't set don't draw Bitu width; @@ -42,8 +40,6 @@ struct SDL_Block { GFX_DrawHandler * draw; GFX_ResizeHandler * resize; bool full_screen; - SDL_Thread * thread; - SDL_mutex * mutex; SDL_Surface * surface; SDL_Joystick * joy; SDL_Color pal[256]; @@ -82,7 +78,7 @@ static void RestorePalette(void) { static void ResetScreen(void) { if (sdl.full_screen) { /* First get the original resolution */ - sdl.surface=SDL_SetVideoMode(sdl.width,sdl.height,sdl.bpp,SDL_HWSURFACE|SDL_HWPALETTE|SDL_FULLSCREEN|SDL_DOUBLEBUF); + sdl.surface=SDL_SetVideoMode(sdl.width,sdl.height,sdl.bpp,SDL_SWSURFACE|SDL_HWPALETTE|SDL_FULLSCREEN); } else { sdl.surface=SDL_SetVideoMode(sdl.width,sdl.height,sdl.bpp,SDL_SWSURFACE|SDL_RESIZABLE); } @@ -148,12 +144,6 @@ void GFX_SwitchFullScreen(void) { } static void GFX_Redraw() { -#if C_THREADED - if (SDL_mutexP(sdl.mutex)) { - E_Exit("Can't Lock Mutex"); - }; -#endif - if (++sdl.frames.countGet_int("sensitivity"); GFX_Resize(640,400,8,0); -#if C_THREADED - sdl.mutex=SDL_CreateMutex(); - sdl.thread = SDL_CreateThread(&SDLGFX_Thread,0); -#else TIMER_RegisterMicroHandler(GFX_Redraw,1000000/70); -#endif SDL_EnableKeyRepeat(250,30); /* Get some Keybinds */