Remove unnecessary code and rename variable

Change-Id: I5926eedd62b4e134067b4d4bb13d30c5d2ab8019
Signed-off-by: Hyunil <hyunil46.park@samsung.com>

diff --git a/src/player.c b/src/player.c
index 75e631b..d5ef753 100644 (file)
--- a/src/player.c
+++ b/src/player.c
@@ -2891,7 +2891,6 @@ int player_set_display(player_h player, player_display_type_e type, player_displ
        int (*p_disp_create_evas_display)(void *, void **) = NULL;
        int (*p_disp_set_evas_display_old_info)(void *, void *, int, int, int) = NULL;
        int (*p_disp_set_evas_display_roi_area)(void *, int, int, int, int) = NULL;
-       void (*p_disp_get_evas_display_geometry_info)(void *, int *, int *, int *, int *) = NULL;
        void (*p_disp_media_packet_video_decode_cb)(media_packet_h, void *) = NULL;
 #endif
        pid_t pid = getpid();
@@ -2907,12 +2906,6 @@ int player_set_display(player_h player, player_display_type_e type, player_displ
 
        PLAYER_VIDEO_SUPPORTABLE_CHECK(pc);
 
-       /* init */
-       wl_win.wl_window_x = 0;
-       wl_win.wl_window_y = 0;
-       wl_win.wl_window_width = 0;
-       wl_win.wl_window_height = 0;
-
        LOGD("ENTER type: %d", type);
        if (type == PLAYER_DISPLAY_TYPE_OBSOLETE_EVAS_WNONE ||
                type == PLAYER_DISPLAY_TYPE_OBSOLETE_NONE_WEVAS) {
@@ -2952,7 +2945,7 @@ int player_set_display(player_h player, player_display_type_e type, player_displ
                        PLAYER_DISP_DLSYM(pc->dl_handle, p_disp_set_wl_display, "disp_set_wl_display");
                        wl_surface_id = p_disp_set_wl_display(ELM_WAYLAND_WIN, display);
                        if (wl_surface_id > 0) {
-                               wl_win.wl_surface_id = wl_surface_id;
+                               wl_win.surface_id = wl_surface_id;
                                wl_win.type = conv_type;
                        } else return PLAYER_ERROR_INVALID_OPERATION;
                }
@@ -2979,9 +2972,6 @@ int player_set_display(player_h player, player_display_type_e type, player_displ
                                }
                                EVAS_INFO(pc)->update_needed = FALSE;
                        }
-                       PLAYER_DISP_DLSYM(pc->dl_handle, p_disp_get_evas_display_geometry_info, "disp_get_evas_display_geometry_info");
-                       p_disp_get_evas_display_geometry_info(display, &wl_win.wl_window_x, &wl_win.wl_window_y, &wl_win.wl_window_width, &wl_win.wl_window_height);
-                       wl_win.type = conv_type;
 
                        PLAYER_DISP_DLSYM(pc->dl_handle, p_disp_media_packet_video_decode_cb, "disp_media_packet_video_decode_cb");
                        ret = player_set_media_packet_video_frame_decoded_cb(player, p_disp_media_packet_video_decode_cb, (void *)EVAS_HANDLE(pc));
@@ -3111,10 +3101,10 @@ int player_set_display_roi_area(player_h player, int x, int y, int width, int he
                EVAS_INFO(pc)->update_needed = TRUE;
        }
 #endif
-       wl_win.wl_window_x = x;
-       wl_win.wl_window_y = y;
-       wl_win.wl_window_width = width;
-       wl_win.wl_window_height = height;
+       wl_win.win_roi_x = x;
+       wl_win.win_roi_y = y;
+       wl_win.win_roi_width = width;
+       wl_win.win_roi_height = height;
 
        arr_msg_len = (sizeof(wl_win_msg_type)/sizeof(int) + (sizeof(wl_win_msg_type)%sizeof(int) ? 1 : 0));
        PLAYER_SEND_MSG(api, pc, ret_buf, ret,

diff --git a/src/player_internal.c b/src/player_internal.c
index 94c09f7..59cb077 100644 (file)
--- a/src/player_internal.c
+++ b/src/player_internal.c
@@ -214,7 +214,7 @@ int player_set_ecore_wl_display(player_h player, player_display_type_e type, voi
        PLAYER_DISP_DLSYM(pc->dl_handle, p_disp_set_wl_display, "disp_set_wl_display");
        wl_surface_id = p_disp_set_wl_display(ECORE_WAYLAND_WIN, ecore_wl2_window);
        if (wl_surface_id > 0) {
-               wl_win.wl_surface_id = wl_surface_id;
+               wl_win.surface_id = wl_surface_id;
                wl_win.type = conv_type;
        } else return PLAYER_ERROR_INVALID_OPERATION;