From 69d5382b63ded702df6146b19c35a163a816e0a4 Mon Sep 17 00:00:00 2001
From: "giwoong.kim" <giwoong.kim@samsung.com>
Date: Thu, 8 Mar 2012 15:24:44 +0900
Subject: [PATCH] [Title] maruskin_sdl [Type] [Module] [Priority] [Jira#]
 [Redmine#] [Problem] [Cause] [Solution] [TestCase]

---
 tizen/src/Makefile.tizen      |  1 +
 tizen/src/skin/maruskin_sdl.c | 63 ++++++++++++++++++-------------------------
 tizen/src/skin/maruskin_sdl.h | 14 ++++++++++
 3 files changed, 41 insertions(+), 37 deletions(-)
 mode change 100644 => 100755 tizen/src/skin/maruskin_sdl.h

diff --git a/tizen/src/Makefile.tizen b/tizen/src/Makefile.tizen
index da0566f..fe455a8 100644
--- a/tizen/src/Makefile.tizen
+++ b/tizen/src/Makefile.tizen
@@ -29,6 +29,7 @@ obj-i386-y += helper_opengl.o opengl_exec.o opengl_server.o
 ##########################################################
 
 # maru skin
+obj-i386-y += maruskin_sdl.o
 
 ##########################################################
 # Build openGL
diff --git a/tizen/src/skin/maruskin_sdl.c b/tizen/src/skin/maruskin_sdl.c
index 353633f..bd7f850 100644
--- a/tizen/src/skin/maruskin_sdl.c
+++ b/tizen/src/skin/maruskin_sdl.c
@@ -30,6 +30,10 @@
 
 #include <pthread.h>
 #include "maruskin_sdl.h"
+#include "../debug_ch.h"
+
+MULTI_DEBUG_CHANNEL(tizen, maruskin_sdl);
+
 
 // TODO : organize
 SDL_Surface *surface_screen;
@@ -44,6 +48,28 @@ static pthread_cond_t sdl_cond = PTHREAD_COND_INITIALIZER;
 static int sdl_thread_initialized = 0;
 #endif
 
+static void qemu_update(void)
+{
+    SDL_Surface *surface = NULL;
+
+    if (!qemu_ds) {
+        return;
+    }
+
+#ifndef SDL_THREAD
+    pthread_mutex_lock(&sdl_mutex);
+#endif
+
+    surface = SDL_GetVideoSurface();
+    SDL_BlitSurface(surface_qemu, NULL, surface_screen, NULL);
+    SDL_UpdateRect(surface_screen, 0, 0, 0, 0);
+
+#ifndef SDL_THREAD
+    pthread_mutex_unlock(&sdl_mutex);
+#endif
+}
+
+
 #ifdef SDL_THREAD
 static void* run_qemu_update(void* arg)
 {
@@ -170,40 +196,3 @@ void maruskin_sdl_init(int swt_handle)
     //  opengl_exec_set_parent_window(info.info.x11.display, info.info.x11.window);
 #endif
 }
-
-static void qemu_update(void)
-{
-    SDL_Surface *surface = NULL;
-
-    if (!qemu_ds) {
-        return;
-    }
-
-#ifndef SDL_THREAD
-    pthread_mutex_lock(&sdl_mutex);
-#endif
-
-    surface = SDL_GetVideoSurface();
-
-    //if (qemu_state->scale == 1) {
-        if (UISTATE.current_mode % 4 != 0) { //rotation
-            SDL_Surface *rot_screen;
-            rot_screen = rotozoomSurface(surface_qemu,
-                    (UISTATE.current_mode % 4) * 90, 1, SMOOTHING_ON);
-            SDL_BlitSurface(rot_screen, NULL, surface_screen, NULL);
-            
-            SDL_FreeSurface(rot_screen);
-        } else {
-            SDL_BlitSurface(surface_qemu, NULL, surface_screen, NULL);
-        }
-    //} 
-
-    /* If 'x', 'y', 'w' and 'h' are all 0, SDL_UpdateRect will update the entire screen.*/
-
-    SDL_UpdateRect(surface_screen, 0, 0, 0, 0);
-
-#ifndef SDL_THREAD
-    pthread_mutex_unlock(&sdl_mutex);
-#endif
-}
-
diff --git a/tizen/src/skin/maruskin_sdl.h b/tizen/src/skin/maruskin_sdl.h
old mode 100644
new mode 100755
index 82ecb31..63455ad
--- a/tizen/src/skin/maruskin_sdl.h
+++ b/tizen/src/skin/maruskin_sdl.h
@@ -28,6 +28,20 @@
  */
 
 
+#include "console.h"
+#ifndef _WIN32
+#include <SDL/SDL.h>
+#include <SDL/SDL_image.h>
+#include <SDL/SDL_syswm.h>
+#else
+#include <windows.h>
+#include <winbase.h>
+#include <SDL.h>
+#include <SDL_image.h>
+#include <SDL_syswm.h>
+#include <SDL_getenv.h>
+#endif
+
 void maruskin_display_init(DisplayState *ds);
 void maruskin_sdl_init(int swt_handle);
 
-- 
2.7.4