From d4b8f484c2e9c5c762ef56ec3da062a3fcf79419 Mon Sep 17 00:00:00 2001
From: Bartosz Taudul <wolf.pld@gmail.com>
Date: Mon, 10 Nov 2008 21:48:15 +0100
Subject: [PATCH] Simplify code.

---
 src/main/symbian/SDL_main.cpp       | 10 ----------
 src/video/symbian/SDL_epocvideo.cpp |  8 +++++---
 src/video/symbian/SDL_epocvideo.h   |  7 ++++---
 symbian/include/internal/epoc_sdl.h |  2 --
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/main/symbian/SDL_main.cpp b/src/main/symbian/SDL_main.cpp
index 2d75803..30d319c 100644
--- a/src/main/symbian/SDL_main.cpp
+++ b/src/main/symbian/SDL_main.cpp
@@ -288,16 +288,6 @@ RWindow* EpocSdlEnv::Window()
 	return gEpocEnv->iDsa->Window();
 }
 
-void EpocSdlEnv::UpdateWholeScreen(bool val)
-{
-	gEpocEnv->iDsa->m_updateWholeScreen = val;
-}
-
-bool EpocSdlEnv::GetUpdateWholeScreen()
-{
-	return gEpocEnv->iDsa->m_updateWholeScreen;
-}
-
 void CSDL::CallMainL()
 {
 	ASSERT(gEpocEnv != NULL);
diff --git a/src/video/symbian/SDL_epocvideo.cpp b/src/video/symbian/SDL_epocvideo.cpp
index 2e56e44..4ac4823 100644
--- a/src/video/symbian/SDL_epocvideo.cpp
+++ b/src/video/symbian/SDL_epocvideo.cpp
@@ -224,6 +224,8 @@ int S60_VideoInit(_THIS, SDL_PixelFormat *vformat)
 		Private->iOrientation[1] = CAknAppUi::EAppUiOrientationPortrait;
 	}
 
+	Private->iUpdateWholeScreen = false;
+
 	return(0);
 }
 
@@ -297,7 +299,7 @@ int S60_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color *colors)
 	if(EpocSdlEnv::SetPalette(firstcolor, ncolors, palette) == KErrNone)
 	{
 		// palette has been updated, redraw whole screen to include changes
-		EpocSdlEnv::UpdateWholeScreen(true);
+		Private->iUpdateWholeScreen = true;
 
 		return 0;
 	}
@@ -680,7 +682,7 @@ static void S60_DirectUpdate(_THIS, int numrects, SDL_Rect *rects)
 		{
 			const TRect target(TPoint(0, 0), Private->iSwSurfaceSize);
 
-			if(EpocSdlEnv::GetUpdateWholeScreen())
+			if(Private->iUpdateWholeScreen)
 			{
 				if(!EpocSdlEnv::AddUpdateRect(Private->iSwSurface, target, target))
 					return;
@@ -693,7 +695,7 @@ static void S60_DirectUpdate(_THIS, int numrects, SDL_Rect *rects)
 							TSize(rects[i].w, rects[i].h));
 					if(!EpocSdlEnv::AddUpdateRect(Private->iSwSurface, rect, target))
 						return; //not succesful
-					EpocSdlEnv::UpdateWholeScreen(false);
+					Private->iUpdateWholeScreen = false;
 				}
 			}
 			EpocSdlEnv::UpdateSwSurface();
diff --git a/src/video/symbian/SDL_epocvideo.h b/src/video/symbian/SDL_epocvideo.h
index 0146e7d..fd600d8 100644
--- a/src/video/symbian/SDL_epocvideo.h
+++ b/src/video/symbian/SDL_epocvideo.h
@@ -40,11 +40,12 @@ typedef CAknAppUi::TAppUiOrientation Orientation;
 struct SDL_PrivateVideoData 
 {
 	TPoint			iScreenPos;
-	TBool                   iIsWindowFocused;
-	TSize                   iSwSurfaceSize;
-	TUint8*                 iSwSurface;
+	TBool			iIsWindowFocused;
+	TSize			iSwSurfaceSize;
+	TUint8*			iSwSurface;
 	SDL_Rect** 		iRect;
 	Orientation*		iOrientation;
+	bool			iUpdateWholeScreen;
 };
 
 struct SDL_PrivateGLData
diff --git a/symbian/include/internal/epoc_sdl.h b/symbian/include/internal/epoc_sdl.h
index d165e47..e8c322b 100644
--- a/symbian/include/internal/epoc_sdl.h
+++ b/symbian/include/internal/epoc_sdl.h
@@ -53,8 +53,6 @@ class EpocSdlEnv
 		static void FreeSurface();
 		static TInt ApplyGlesDsa();
 		static RWindow* Window();
-		static void UpdateWholeScreen(bool val);
-		static bool GetUpdateWholeScreen();
 };
 
 #endif
-- 
2.11.4.GIT