From ba73dca2cbf5cbec68171bc4b196f5bf61ae4d92 Mon Sep 17 00:00:00 2001 From: Hyunil Date: Thu, 1 Aug 2019 16:12:27 +0900 Subject: [PATCH] Change data type of surface id Change-Id: If73dd33d4bd58165f84b3fb4a78f1e15a2fdea0b Signed-off-by: Hyunil --- disp/player_display.c | 11 ++++------- disp/player_display.h | 2 +- src/player.c | 2 +- src/player_internal.c | 4 ++-- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/disp/player_display.c b/disp/player_display.c index e0c9ebb..f864354 100644 --- a/disp/player_display.c +++ b/disp/player_display.c @@ -59,7 +59,7 @@ static void _wl_client_finalize(wl_client *wlclient); /*elm wayland window use display and ecore wayland window use ecore_win */ -unsigned int disp_set_wl_display(int wl_win_type, void *win) +int disp_set_wl_display(int wl_win_type, void *win) { Evas_Object *obj = NULL; const char *object_type = NULL; @@ -68,7 +68,7 @@ unsigned int disp_set_wl_display(int wl_win_type, void *win) Ecore_Wl2_Window *wl_window = NULL; Ecore_Evas *ee = NULL; Ecore_Wl2_Display *e_wl2_display = NULL; - unsigned int wl_surface_id = 0; + int wl_surface_id = 0; Evas *e; wl_client *wlclient; int ret = 0; @@ -295,10 +295,7 @@ void disp_media_packet_video_decode_cb(media_packet_h packet, void *evas_handle) static void handle_resource_id(void *data, struct tizen_resource *tizen_resource, uint32_t id) { - unsigned int *wl_surface_id = data; - - *wl_surface_id = id; - + *((int *)data) = (int)id; LOGD("[CLIENT] got wl_surface_id(%d) from server\n", id); } @@ -354,7 +351,7 @@ static int _wl_client_get_wl_window_wl_surface_id(wl_client *wlclient, struct wl goto_if_fail(surface != NULL, failed); goto_if_fail(display != NULL, failed); - unsigned int wl_surface_id = 0; + int wl_surface_id = 0; wlclient->display = display; goto_if_fail(wlclient->display != NULL, failed); diff --git a/disp/player_display.h b/disp/player_display.h index c126941..68cf600 100644 --- a/disp/player_display.h +++ b/disp/player_display.h @@ -22,7 +22,7 @@ extern "C" { #endif -unsigned int disp_set_wl_display(int wl_win_type, void *win); +int disp_set_wl_display(int wl_win_type, void *win); void disp_get_evas_display_geometry_info(void *display, int *x, int *y, int *width, int *height); int disp_evas_display_retrieve_all_packets(MMHandleType evas_handle, bool keep_screen); int disp_get_evas_display_rotation(MMHandleType evas_handle, int *p_rotate); diff --git a/src/player.c b/src/player.c index f0eb024..7aa9419 100644 --- a/src/player.c +++ b/src/player.c @@ -3051,7 +3051,7 @@ int player_set_display(player_h player, player_display_type_e type, player_displ char *ret_buf = NULL; wl_win_msg_type wl_win; char *wl_win_msg = (char *)&wl_win; - unsigned int wl_surface_id; + int wl_surface_id; player_private_display_type_e conv_type = PLAYER_DISPLAY_TYPE_NONE; unsigned int (*p_disp_set_wl_display)(int, void *) = NULL; int arr_msg_len = 0; diff --git a/src/player_internal.c b/src/player_internal.c index 4e37402..b45b26d 100644 --- a/src/player_internal.c +++ b/src/player_internal.c @@ -149,9 +149,9 @@ int player_set_ecore_wl_display(player_h player, player_display_type_e type, voi char *ret_buf = NULL; wl_win_msg_type wl_win; char *wl_win_msg = (char *)&wl_win; - unsigned int wl_surface_id; + int wl_surface_id; player_private_display_type_e conv_type; - unsigned int (*p_disp_set_wl_display)(int, void *) = NULL; + int (*p_disp_set_wl_display)(int, void *) = NULL; int arr_msg_len = 0; LOGD("ENTER"); -- 2.7.4