Change data type of surface id 91/211291/3
authorHyunil <hyunil46.park@samsung.com>
Thu, 1 Aug 2019 07:12:27 +0000 (16:12 +0900)
committerHyunil <hyunil46.park@samsung.com>
Thu, 1 Aug 2019 10:33:06 +0000 (19:33 +0900)
Change-Id: If73dd33d4bd58165f84b3fb4a78f1e15a2fdea0b
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
disp/player_display.c
disp/player_display.h
src/player.c
src/player_internal.c

index e0c9ebb32a7950a06e7eac2e6d1dee6fa2b78b76..f864354b447e870fd6b041c1653e182ee9ff72e6 100644 (file)
@@ -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);
index c126941b75670ec1e46cc31734ba792b5ec5dcda..68cf6001843d11b29d3d800cbaf673b8026152f7 100644 (file)
@@ -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);
index f0eb024c92a08ce605466cb71263b4cfdb25e1f6..7aa9419f54c1c6decb456c7fc151285455e942f3 100644 (file)
@@ -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;
index 4e374022a9d621fd92edcc06fd9f4e0b15faaed4..b45b26d33f9433a6913c7561524ff2d55cda7719 100644 (file)
@@ -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");