From bdb77d6aa012f1d0fa3c673da4eedb88ee46399c Mon Sep 17 00:00:00 2001 From: "Wonsik, Jung" Date: Wed, 22 Jun 2016 15:46:33 +0900 Subject: [PATCH] [SDL_Tizen] clean up and modify log Change-Id: I2314153393c23b838b96a2dfac43c5588fe285f4 --- src/video/tizen/SDL_tizenkeyboard.c | 8 ++++---- src/video/tizen/SDL_tizenmouse.c | 2 -- src/video/tizen/SDL_tizenvideo.c | 8 +------- src/video/tizen/SDL_tizenvideo.h | 6 ------ src/video/tizen/SDL_tizenwindow.c | 9 --------- 5 files changed, 5 insertions(+), 28 deletions(-) diff --git a/src/video/tizen/SDL_tizenkeyboard.c b/src/video/tizen/SDL_tizenkeyboard.c index 6fa5d89..4c00916 100644 --- a/src/video/tizen/SDL_tizenkeyboard.c +++ b/src/video/tizen/SDL_tizenkeyboard.c @@ -23,6 +23,7 @@ #include "../../SDL_internal.h" #include "SDL_tizenkeyboard.h" +#include "SDL_log.h" /* Tizen Keyboard @@ -32,8 +33,7 @@ void _ecore_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info) { char *commit_str = (char *)event_info; - printf("commit string : %s\n", commit_str); - + SDL_LogDebug(SDL_LOG_CATEGORY_APPLICATION, "commit string : %s\n", commit_str); SDL_SendKeyboardText(commit_str); return; } @@ -43,7 +43,7 @@ _ecore_imf_event_state_change_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, { //ECORE_IMF_INPUT_PANEL_STATE_SHOW : 0 //ECORE_IMF_INPUT_PANEL_STATE_HIDE : 1 - printf("Keyboard State : %d\n", value); + SDL_LogDebug(SDL_LOG_CATEGORY_APPLICATION, "Keyboard State : %d\n", value); return; } @@ -56,7 +56,7 @@ void Tizen_InitKeyboard(_THIS) const char *default_id = ecore_imf_context_default_id_get(); if (!default_id) { - fprintf(stderr, "Can't create ecore_imf_context\n"); + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Can't create ecore_imf_context\n"); return; } diff --git a/src/video/tizen/SDL_tizenmouse.c b/src/video/tizen/SDL_tizenmouse.c index b0dbb50..0544704 100644 --- a/src/video/tizen/SDL_tizenmouse.c +++ b/src/video/tizen/SDL_tizenmouse.c @@ -43,7 +43,6 @@ Eina_Bool __tizen_cb_event_mouseup_change(void *data, int type, void *event) { SDL_VideoDevice *_this = SDL_GetVideoDevice(); - printf("TIZEN EV :mouse up\n"); if (!event) return ECORE_CALLBACK_PASS_ON; Ecore_Event_Mouse_Button *e = event; @@ -57,7 +56,6 @@ Eina_Bool __tizen_cb_event_mousemove_change(void *data, int type, void *event) { SDL_VideoDevice *_this = SDL_GetVideoDevice(); - printf("TIZEN : mousemove\n"); if (!event) return ECORE_CALLBACK_PASS_ON; diff --git a/src/video/tizen/SDL_tizenvideo.c b/src/video/tizen/SDL_tizenvideo.c index 12eabec..341883b 100644 --- a/src/video/tizen/SDL_tizenvideo.c +++ b/src/video/tizen/SDL_tizenvideo.c @@ -79,21 +79,18 @@ __tizen_add_display(SDL_VideoData *d, uint32_t id) static int Tizen_Available(void) { - TRACE_ENTER(); return 1; } static void Tizen_DeleteDevice(SDL_VideoDevice *device) { - TRACE_ENTER(); SDL_free(device); } static SDL_VideoDevice * Tizen_CreateDevice(int devindex) { - TRACE_ENTER(); SDL_VideoDevice *device; /* Initialize all variables that we clean on shutdown */ @@ -152,7 +149,6 @@ VideoBootStrap TIZEN_bootstrap = { int Tizen_VideoInit(_THIS) { - TRACE_ENTER(); SDL_VideoData *data = SDL_malloc(sizeof * data); if (data == NULL) @@ -171,20 +167,18 @@ Tizen_VideoInit(_THIS) static void Tizen_GetDisplayModes(_THIS, SDL_VideoDisplay *sdl_display) { - TRACE_ENTER(); + } static int Tizen_SetDisplayMode(_THIS, SDL_VideoDisplay *display, SDL_DisplayMode *mode) { - TRACE_ENTER(); return SDL_Unsupported(); } void Tizen_VideoQuit(_THIS) { - TRACE_ENTER(); SDL_VideoData *data = _this->driverdata; Tizen_DeinitWindow(_this); diff --git a/src/video/tizen/SDL_tizenvideo.h b/src/video/tizen/SDL_tizenvideo.h index 3df07c8..0501cc3 100644 --- a/src/video/tizen/SDL_tizenvideo.h +++ b/src/video/tizen/SDL_tizenvideo.h @@ -36,12 +36,6 @@ typedef struct { Eina_Hash *windows; } SDL_VideoData; -#ifdef ENABLE_DEBUG -#define TRACE_ENTER() printf("[SDL] %s:%d\n", __FUNCTION__, __LINE__) -#else -#define TRACE_ENTER() -#endif - #endif /* _SDL_tizenvideo_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/tizen/SDL_tizenwindow.c b/src/video/tizen/SDL_tizenwindow.c index 64b06c8..8e4debb 100644 --- a/src/video/tizen/SDL_tizenwindow.c +++ b/src/video/tizen/SDL_tizenwindow.c @@ -41,21 +41,18 @@ SDL_bool Tizen_GetWindowWMInfo(_THIS, SDL_Window *window, SDL_SysWMinfo *info) { - TRACE_ENTER(); return SDL_TRUE; } int Tizen_SetWindowHitTest(SDL_Window *window, SDL_bool enabled) { - TRACE_ENTER(); return 0; /* just succeed, the real work is done elsewhere. */ } void Tizen_ShowWindow(_THIS, SDL_Window *window) { - TRACE_ENTER(); SDL_WindowData *wind = window->driverdata; ecore_wl_window_show(wind->window); @@ -65,14 +62,12 @@ void Tizen_SetWindowFullscreen(_THIS, SDL_Window *window, SDL_VideoDisplay *_display, SDL_bool fullscreen) { - TRACE_ENTER(); /*DO NOTHING*/ } int Tizen_CreateWindow(_THIS, SDL_Window *window) { - TRACE_ENTER(); SDL_VideoData *data = _this->driverdata; SDL_WindowData *wind; @@ -119,7 +114,6 @@ Tizen_CreateWindow(_THIS, SDL_Window *window) void Tizen_SetWindowSize(_THIS, SDL_Window *window) { - TRACE_ENTER(); SDL_WindowData *wind = window->driverdata; wl_egl_window_resize(wind->egl_window, window->w, window->h, 0, 0); @@ -128,7 +122,6 @@ Tizen_SetWindowSize(_THIS, SDL_Window *window) void Tizen_DestroyWindow(_THIS, SDL_Window *window) { - TRACE_ENTER(); SDL_VideoData *data = _this->driverdata; SDL_WindowData *wind = window->driverdata; @@ -178,7 +171,6 @@ __tizen_cb_window_visibility_change(void *data, int type, void *event) int Tizen_InitWindow(_THIS) { - TRACE_ENTER(); SDL_VideoData *data = _this->driverdata; data->windows = eina_hash_int32_new(NULL); @@ -203,7 +195,6 @@ Tizen_InitWindow(_THIS) void Tizen_DeinitWindow(_THIS) { - TRACE_ENTER(); SDL_VideoData *data = _this->driverdata; eina_hash_free(data->windows); -- 2.7.4