Remove X display dependency source code

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ccec4714da7c19f90857482275e65effeffc2391..45f8809d174610ba9569da5ea47851380c6adb74 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,12 +41,6 @@ IF("${ARCH}" STREQUAL "arm")
     ADD_DEFINITIONS("-DTARGET")
 ENDIF("${ARCH}" STREQUAL "arm")
 
-IF(WAYLAND_SUPPORT)
- ADD_DEFINITIONS("-DHAVE_WAYLAND")
-ENDIF(WAYLAND_SUPPORT)
-IF(X11_SUPPORT)
- ADD_DEFINITIONS("-DHAVE_X11")
-ENDIF(X11_SUPPORT)
 IF (EVAS_RENDERER_SUPPORT)
  ADD_DEFINITIONS("-DEVAS_RENDERER_SUPPORT")
 ENDIF(EVAS_RENDERER_SUPPORT)

diff --git a/include/common/player_internal.h b/include/common/player_internal.h
index 2af4579687974f6245c69dd06b4f7b19a51b06d2..b1e7c61da710df44fc6d2ba3ded99d50ed702e5a 100644 (file)
--- a/include/common/player_internal.h
+++ b/include/common/player_internal.h
@@ -20,9 +20,7 @@
 #ifdef TIZEN_TV
 #include <glib.h>
 #endif
-#ifdef HAVE_WAYLAND
 #include <Ecore_Wayland.h>
-#endif
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -238,7 +236,6 @@ int player_unset_media_stream_buffer_status_cb_ex(player_h player, player_stream
  */
 int player_set_media_stream_dynamic_resolution(player_h player, bool drc);
 
-#ifdef HAVE_WAYLAND
 /**
  * @brief Sets the ecore wayland video display.
  * @since_tizen 3.0
@@ -260,7 +257,6 @@ int player_set_media_stream_dynamic_resolution(player_h player, bool drc);
  * @see player_set_display_rotation
  */
 int player_set_ecore_wl_display(player_h player, player_display_type_e type, Ecore_Wl_Window *ecore_wl_window, int x, int y, int  width, int height);
-#endif
 
 #ifdef TIZEN_TV
 /**

diff --git a/include/wearable/player_internal.h b/include/wearable/player_internal.h
index 2bc6ddf4c613440d9dd008536fcfc41d53da9acf..395abfbad6d4289227f80de102a8f1cac579e085 100644 (file)
--- a/include/wearable/player_internal.h
+++ b/include/wearable/player_internal.h
@@ -17,9 +17,7 @@
 #ifndef __TIZEN_MEDIA_PLAYER_INTERNAL_H__
 #define        __TIZEN_MEDIA_PLAYER_INTERNAL_H__
 #include <player.h>
-#ifdef HAVE_WAYLAND
 #include <Ecore_Wayland.h>
-#endif
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -254,7 +252,6 @@ int player_set_gapless(player_h player, bool gapless);
  */
 int player_is_gapless(player_h player, bool *gapless);
 
-#ifdef HAVE_WAYLAND
 /**
  * @brief Sets the ecore wayland video display.
  * @since_tizen 3.0
@@ -277,7 +274,6 @@ int player_is_gapless(player_h player, bool *gapless);
  */
 int player_set_ecore_wl_display(player_h player, player_display_type_e type, Ecore_Wl_Window *ecore_wl_window, int x, int y, int  width, int height);
 
-#endif
 
 
 /**

diff --git a/packaging/capi-media-player.spec b/packaging/capi-media-player.spec
index 8b08723d3437420bf90e7f460c1f040691714ecc..34be4cce2b719d081a66fef599a7547fff5ffd3a 100644 (file)
--- a/packaging/capi-media-player.spec
+++ b/packaging/capi-media-player.spec
@@ -1,9 +1,6 @@
-%bcond_with wayland
-%bcond_with x
-
 Name:       capi-media-player
 Summary:    A Media Player API
-Version:    0.3.10
+Version:    0.3.11
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
@@ -21,12 +18,7 @@ BuildRequires:  pkgconfig(appcore-efl)
 BuildRequires:  pkgconfig(elementary)
 BuildRequires:  pkgconfig(ecore)
 BuildRequires:  pkgconfig(evas)
-%if %{with x}
-BuildRequires:  pkgconfig(ecore-x)
-%endif
-%if %{with wayland}
 BuildRequires:  pkgconfig(ecore-wayland)
-%endif
 BuildRequires:  pkgconfig(capi-media-tool)
 BuildRequires:  pkgconfig(mmsvc-player)
 BuildRequires:  pkgconfig(json-c)
@@ -71,16 +63,6 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %if "%{?profile}" == "tv"
     -DTIZEN_TV=YES \
 %endif
-%if %{with wayland}
-    -DWAYLAND_SUPPORT=On \
-%else
-    -DWAYLAND_SUPPORT=Off \
-%endif
-%if %{with x}
-    -DX11_SUPPORT=On \
-%else
-    -DX11_SUPPORT=Off \
-%endif
 %if "%{?profile}" == "tv" || "%{?profile}" == "wearable"
        -DEVAS_RENDERER_SUPPORT=Off
 %else

diff --git a/src/player.c b/src/player.c
index ad9fa80f85586e30ab3052e59c3ebcde424ce413..26ff5f79f048eee41a347d5196f5eeb4e7ddf7ed 100644 (file)
--- a/src/player.c
+++ b/src/player.c
@@ -25,9 +25,7 @@
 #include <Evas.h>
 #include <Elementary.h>
 #include <Ecore.h>
-#ifdef HAVE_WAYLAND
 #include <Ecore_Wayland.h>
-#endif
 #include <dlog.h>
 #include <mm_error.h>
 #include <muse_core.h>
@@ -1925,16 +1923,12 @@ int player_set_display(player_h player, player_display_type_e type, player_displ
        char *ret_buf = NULL;
        Evas_Object *obj = NULL;
        const char *object_type = NULL;
-#ifdef HAVE_WAYLAND
        wl_win_msg_type wl_win;
        char *wl_win_msg = (char *)&wl_win;
        unsigned int wl_surface_id;
        struct wl_surface *wl_surface;
        struct wl_display *wl_display;
        Ecore_Wl_Window *wl_window = NULL;
-#else
-       unsigned int xhandle = 0;
-#endif
 
        LOGD("ENTER");
 
@@ -1946,7 +1940,6 @@ int player_set_display(player_h player, player_display_type_e type, player_displ
                object_type = evas_object_type_get(obj);
                if (object_type) {
                        if (type == PLAYER_DISPLAY_TYPE_OVERLAY && !strcmp(object_type, "elm_win")) {
-#ifdef HAVE_WAYLAND
                                /* wayland overlay surface */
                                LOGI("Wayland overlay surface type");
                                wl_win.type = type;
@@ -1984,11 +1977,6 @@ int player_set_display(player_h player, player_display_type_e type, player_displ
                                        g_free(pc->wlclient);
                                        pc->wlclient = NULL;
                                }
-#else
-                               /* x window overlay surface */
-                               LOGI("overlay surface type");
-                               xhandle = elm_win_xwindow_get(obj);
-#endif
                        }
 #ifdef EVAS_RENDERER_SUPPORT
                        else if (type == PLAYER_DISPLAY_TYPE_EVAS && !strcmp(object_type, "image")) {
@@ -2017,7 +2005,6 @@ int player_set_display(player_h player, player_display_type_e type, player_displ
                } else
                        return PLAYER_ERROR_INVALID_PARAMETER;
        }
-#ifdef HAVE_WAYLAND
        else {  /* PLAYER_DISPLAY_TYPE_NONE */
                LOGI("Wayland surface type is NONE");
                wl_win.type = type;
@@ -2027,10 +2014,6 @@ int player_set_display(player_h player, player_display_type_e type, player_displ
                wl_win.wl_window_height = 0;
        }
        player_msg_send_array(api, pc, ret_buf, ret, wl_win_msg, sizeof(wl_win_msg_type), sizeof(char));
-#else
-       player_msg_send2(api, pc, ret_buf, ret, INT, type, INT, xhandle);
-#endif
-
        g_free(ret_buf);
        return ret;
 }

diff --git a/src/player_internal.c b/src/player_internal.c
index ec9ac0c49e7bfb1555ff58dda0bcd17949bc76e3..b3067644aaa0a491dd5437f2dc3941805553ea28 100644 (file)
--- a/src/player_internal.c
+++ b/src/player_internal.c
@@ -24,9 +24,7 @@
 #include <dlog.h>
 #include <Evas.h>
 #include <Ecore_Evas.h>
-#ifdef HAVE_WAYLAND
 #include <Ecore_Wayland.h>
-#endif
 #include <muse_player.h>
 #include <muse_player_msg.h>
 #include "player_private.h"
@@ -274,7 +272,6 @@ int player_set_media_stream_dynamic_resolution(player_h player, bool drc)
        return ret;
 }
 
-#ifdef HAVE_WAYLAND
 int player_set_ecore_wl_display(player_h player, player_display_type_e type, Ecore_Wl_Window *ecore_wl_window, int x, int y, int  width, int height)
 {
        PLAYER_INSTANCE_CHECK(player);
@@ -342,7 +339,6 @@ int player_set_ecore_wl_display(player_h player, player_display_type_e type, Eco
 
        return ret;
 }
-#endif
 
 #ifndef TIZEN_TV
 int player_set_next_uri(player_h player, const char *uri)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b1e459490d00343b774e60c8f582ed6b111616bc..c45fd8a21ba824d428113c31020cb403cbe6e2a8 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -4,12 +4,8 @@ SET(fw_test "${fw_name}-test")
 INCLUDE_DIRECTORIES(../include/common)
 link_directories(${CMAKE_SOURCE_DIR}/../)
 
-IF(X11_SUPPORT)
-       SET(WIN_PKG "ecore-x")
-ENDIF(X11_SUPPORT)
-IF(WAYLAND_SUPPORT)
-       SET(WIN_PKG "${WIN_PKG} ecore-wayland")
-ENDIF(WAYLAND_SUPPORT)
+SET(WIN_PKG "${WIN_PKG} ecore-wayland")
+
 INCLUDE(FindPkgConfig)
 pkg_check_modules(${fw_test} REQUIRED appcore-efl elementary ecore evas capi-media-sound-manager ${WIN_PKG})
 FOREACH(flag ${${fw_test}_CFLAGS})
@@ -18,14 +14,6 @@ ENDFOREACH(flag)
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -pie")
 
-IF(WAYLAND_SUPPORT)
-    ADD_DEFINITIONS("-DHAVE_WAYLAND")
-ENDIF(WAYLAND_SUPPORT)
-
-IF(X11_SUPPORT)
-    ADD_DEFINITIONS("-DHAVE_X11")
-ENDIF(X11_SUPPORT)
-
 aux_source_directory(. sources)
 FOREACH(src ${sources})
     GET_FILENAME_COMPONENT(src_name ${src} NAME_WE)

diff --git a/test/player_es_push_test.c b/test/player_es_push_test.c
index 9185d852b65a8b058651332c229b46c7b0ee0e62..076b116fa6d9900cd824af1d94f7f90ba19a0059 100644 (file)
--- a/test/player_es_push_test.c
+++ b/test/player_es_push_test.c
@@ -21,10 +21,8 @@
 #include <player_internal.h>
 #include <glib.h>
 #include <appcore-efl.h>
-#ifdef HAVE_WAYLAND
 #include <Ecore.h>
 #include <Ecore_Wayland.h>
-#endif
 
 #define KEY_END "XF86Stop"
 
@@ -121,9 +119,7 @@ static Evas_Object *create_win(const char *name)
                g_print("window size :%d,%d", w, h);
                evas_object_resize(eo, w, h);
                elm_win_autodel_set(eo, EINA_TRUE);
-#ifdef HAVE_WAYLAND
                elm_win_alpha_set(eo, EINA_TRUE);
-#endif
        }
        return eo;
 }

diff --git a/test/player_test.c b/test/player_test.c
index ffd0c7d8a99f58f31091494d6910251c573f1df1..334676e78068f0402e36aa8852680f7c89b3e44e 100644 (file)
--- a/test/player_test.c
+++ b/test/player_test.c
@@ -21,13 +21,8 @@
 #include <dlfcn.h>
 #include <appcore-efl.h>
 #include <Elementary.h>
-#ifdef HAVE_X11
-#include <Ecore_X.h>
-#endif
-#ifdef HAVE_WAYLAND
 #include <Ecore.h>
 #include <Ecore_Wayland.h>
-#endif
 #ifdef _ACTIVATE_EOM_
 #include <eom.h>
 #endif
@@ -98,11 +93,11 @@ enum {
 #define MAX_HANDLE 20
 
 /* for video display */
-static Evas_Object *g_xid;
+static Evas_Object *g_win_id;
 #ifdef _ACTIVATE_EOM_
-static Evas_Object *g_external_xid;
+static Evas_Object *g_external_win_id;
 #endif
-static Evas_Object *selected_xid;
+static Evas_Object *selected_win_id;
 static Evas_Object *g_eo[MAX_HANDLE] = { 0, };
 
 static int g_current_surface_type = PLAYER_DISPLAY_TYPE_OVERLAY;
@@ -110,11 +105,6 @@ static int g_current_surface_type = PLAYER_DISPLAY_TYPE_OVERLAY;
 typedef struct {
        Evas_Object *win;
        Evas_Object *layout_main;       /* layout widget based on EDJ */
-#ifdef HAVE_X11
-       Ecore_X_Window xid;
-#elif HAVE_WAYLAND
-       unsigned int xid;
-#endif
        /* add more variables here */
 #ifdef _ACTIVATE_EOM_
        int hdmi_output_id;
@@ -152,9 +142,7 @@ static Evas_Object *create_win(const char *name)
                g_print("window size :%d,%d", w, h);
                evas_object_resize(eo, w, h);
                elm_win_autodel_set(eo, EINA_TRUE);
-#ifdef HAVE_WAYLAND
                elm_win_alpha_set(eo, EINA_TRUE);
-#endif
        }
        return eo;
 }
@@ -247,14 +235,14 @@ static void eom_notify_cb_output_add(eom_output_id output_id, void *user_data)
        }
        g_print("[eom] output(%d) connected\n", output_id);
        /* it is for external window */
-       if (!g_external_xid) {
-               g_external_xid = elm_win_add(NULL, "External", ELM_WIN_BASIC);
-               if (eom_set_output_window(info->hdmi_output_id, g_external_xid) == EOM_ERROR_NONE) {
-                       create_render_rect_and_bg(g_external_xid);
+       if (!g_external_win_id) {
+               g_external_win_id = elm_win_add(NULL, "External", ELM_WIN_BASIC);
+               if (eom_set_output_window(info->hdmi_output_id, g_external_win_id) == EOM_ERROR_NONE) {
+                       create_render_rect_and_bg(g_external_win_id);
                        g_print("[eom] create external window\n");
                } else {
-                       evas_object_del(g_external_xid);
-                       g_external_xid = NULL;
+                       evas_object_del(g_external_win_id);
+                       g_external_win_id = NULL;
                        g_print("[eom] create external window fail\n");
                }
        }
@@ -271,28 +259,28 @@ static void eom_notify_cb_output_remove(eom_output_id output_id, void *user_data
        }
        g_print("[eom] output(%d) disconnected\n", output_id);
 
-       if (selected_xid == g_external_xid && g_player[0]) {
+       if (selected_win_id == g_external_win_id && g_player[0]) {
                player_get_state(g_player[0], &state);
                if (state >= PLAYER_STATE_READY) {
-                       if (!g_xid) {
-                               g_xid = create_win(PACKAGE);
-                               if (g_xid == NULL)
+                       if (!g_win_id) {
+                               g_win_id = create_win(PACKAGE);
+                               if (g_win_id == NULL)
                                        return;
-                               g_print("create xid %p\n", g_xid);
-                               create_render_rect_and_bg(g_xid);
-                               elm_win_activate(g_xid);
-                               evas_object_show(g_xid);
+                               g_print("create win_id %p\n", g_win_id);
+                               create_render_rect_and_bg(g_win_id);
+                               elm_win_activate(g_win_id);
+                               evas_object_show(g_win_id);
                        }
-                       player_set_display(g_player[0], PLAYER_DISPLAY_TYPE_OVERLAY, GET_DISPLAY(g_xid));
+                       player_set_display(g_player[0], PLAYER_DISPLAY_TYPE_OVERLAY, GET_DISPLAY(g_win_id));
                }
        }
 
        /* it is for external window */
-       if (g_external_xid) {
-               evas_object_del(g_external_xid);
-               g_external_xid = NULL;
+       if (g_external_win_id) {
+               evas_object_del(g_external_win_id);
+               g_external_win_id = NULL;
        }
-       selected_xid = g_xid;
+       selected_win_id = g_win_id;
 }
 
 static void eom_notify_cb_mode_changed(eom_output_id output_id, void *user_data)
@@ -327,59 +315,59 @@ static void eom_notify_cb_attribute_changed(eom_output_id output_id, void *user_
        g_print("[eom] output(%d) attribute changed(%d, %d)\n", output_id, attribute, state);
        if (state == EOM_OUTPUT_ATTRIBUTE_STATE_ACTIVE) {
                g_print("[eom] active\n");
-               if (!g_external_xid) {
-                       g_external_xid = elm_win_add(NULL, "External", ELM_WIN_BASIC);
-                       if (eom_set_output_window(info->hdmi_output_id, g_external_xid) == EOM_ERROR_NONE) {
-                               create_render_rect_and_bg(g_external_xid);
+               if (!g_external_win_id) {
+                       g_external_win_id = elm_win_add(NULL, "External", ELM_WIN_BASIC);
+                       if (eom_set_output_window(info->hdmi_output_id, g_external_win_id) == EOM_ERROR_NONE) {
+                               create_render_rect_and_bg(g_external_win_id);
                                g_print("[eom] create external window\n");
                        } else {
-                               evas_object_del(g_external_xid);
-                               g_external_xid = NULL;
+                               evas_object_del(g_external_win_id);
+                               g_external_win_id = NULL;
                                g_print("[eom] create external window fail\n");
                        }
                }
-               selected_xid = g_external_xid;
+               selected_win_id = g_external_win_id;
                /* play video on external window */
                if (g_player[0])
-                       player_set_display(g_player[0], PLAYER_DISPLAY_TYPE_OVERLAY, GET_DISPLAY(selected_xid));
+                       player_set_display(g_player[0], PLAYER_DISPLAY_TYPE_OVERLAY, GET_DISPLAY(selected_win_id));
        } else if (state == EOM_OUTPUT_ATTRIBUTE_STATE_INACTIVE) {
                g_print("[eom] inactive\n");
-               if (!g_xid) {
-                       g_xid = create_win(PACKAGE);
-                       if (g_xid == NULL)
+               if (!g_win_id) {
+                       g_win_id = create_win(PACKAGE);
+                       if (g_win_id == NULL)
                                return;
-                       g_print("create xid %p\n", g_xid);
-                       create_render_rect_and_bg(g_xid);
-                       elm_win_activate(g_xid);
-                       evas_object_show(g_xid);
+                       g_print("create win_id %p\n", g_win_id);
+                       create_render_rect_and_bg(g_win_id);
+                       elm_win_activate(g_win_id);
+                       evas_object_show(g_win_id);
                }
-               selected_xid = g_xid;
+               selected_win_id = g_win_id;
                if (g_player[0])
-                       player_set_display(g_player[0], PLAYER_DISPLAY_TYPE_OVERLAY, GET_DISPLAY(selected_xid));
+                       player_set_display(g_player[0], PLAYER_DISPLAY_TYPE_OVERLAY, GET_DISPLAY(selected_win_id));
 
-               if (g_external_xid) {
-                       evas_object_del(g_external_xid);
-                       g_external_xid = NULL;
+               if (g_external_win_id) {
+                       evas_object_del(g_external_win_id);
+                       g_external_win_id = NULL;
                }
        } else if (state == EOM_OUTPUT_ATTRIBUTE_STATE_LOST) {
                g_print("[eom] lost\n");
-               if (!g_xid) {
-                       g_xid = create_win(PACKAGE);
-                       if (g_xid == NULL)
+               if (!g_win_id) {
+                       g_win_id = create_win(PACKAGE);
+                       if (g_win_id == NULL)
                                return;
-                       g_print("create xid %p\n", g_xid);
-                       create_render_rect_and_bg(g_xid);
-                       elm_win_activate(g_xid);
-                       evas_object_show(g_xid);
+                       g_print("create win_id %p\n", g_win_id);
+                       create_render_rect_and_bg(g_win_id);
+                       elm_win_activate(g_win_id);
+                       evas_object_show(g_win_id);
                }
-               selected_xid = g_xid;
+               selected_win_id = g_win_id;
 
                if (g_player[0])
-                       player_set_display(g_player[0], PLAYER_DISPLAY_TYPE_OVERLAY, GET_DISPLAY(selected_xid));
+                       player_set_display(g_player[0], PLAYER_DISPLAY_TYPE_OVERLAY, GET_DISPLAY(selected_win_id));
 
-               if (g_external_xid) {
-                       evas_object_del(g_external_xid);
-                       g_external_xid = NULL;
+               if (g_external_win_id) {
+                       evas_object_del(g_external_win_id);
+                       g_external_win_id = NULL;
                }
 
                eom_unset_output_added_cb(eom_notify_cb_output_add);
@@ -406,8 +394,8 @@ static int app_create(void *data)
        if (win == NULL)
                return -1;
        ad->win = win;
-       g_xid = win;
-       selected_xid = g_xid;
+       g_win_id = win;
+       selected_win_id = g_win_id;
        create_render_rect_and_bg(ad->win);
        /* Create evas image object for EVAS surface */
        g_eo[0] = create_image_object(ad->win);
@@ -434,16 +422,16 @@ static int app_create(void *data)
 
        eom_get_output_mode(ad->hdmi_output_id, &output_mode);
        if (output_mode != EOM_OUTPUT_MODE_NONE) {
-               g_external_xid = elm_win_add(NULL, "External", ELM_WIN_BASIC);
-               if (eom_set_output_window(ad->hdmi_output_id, g_external_xid) == EOM_ERROR_NONE) {
-                       create_render_rect_and_bg(g_external_xid);
+               g_external_win_id = elm_win_add(NULL, "External", ELM_WIN_BASIC);
+               if (eom_set_output_window(ad->hdmi_output_id, g_external_win_id) == EOM_ERROR_NONE) {
+                       create_render_rect_and_bg(g_external_win_id);
                        g_print("[eom] create external window\n");
                } else {
-                       evas_object_del(g_external_xid);
-                       g_external_xid = NULL;
+                       evas_object_del(g_external_win_id);
+                       g_external_win_id = NULL;
                        g_print("[eom] create external window fail\n");
                }
-               selected_xid = g_external_xid;
+               selected_win_id = g_external_win_id;
        }
 
        /* set callback for detecting external device */
@@ -466,18 +454,18 @@ static int app_terminate(void *data)
                        g_eo[i] = NULL;
                }
        }
-       if (g_xid) {
-               evas_object_del(g_xid);
-               g_xid = NULL;
+       if (g_win_id) {
+               evas_object_del(g_win_id);
+               g_win_id = NULL;
        }
 #ifdef _ACTIVATE_EOM_
-       if (g_external_xid) {
-               evas_object_del(g_external_xid);
-               g_external_xid = NULL;
+       if (g_external_win_id) {
+               evas_object_del(g_external_win_id);
+               g_external_win_id = NULL;
        }
 #endif
        ad->win = NULL;
-       selected_xid = NULL;
+       selected_win_id = NULL;
 #ifdef _ACTIVATE_EOM_
        eom_unset_output_added_cb(eom_notify_cb_output_add);
        eom_unset_output_removed_cb(eom_notify_cb_output_remove);
@@ -910,7 +898,7 @@ static void _player_prepare(bool async)
                player_set_subtitle_updated_cb(g_player[0], subtitle_updated_cb, (void *)g_player[0]);
        }
        if (g_current_surface_type == PLAYER_DISPLAY_TYPE_OVERLAY) {
-               player_set_display(g_player[0], g_current_surface_type, GET_DISPLAY(selected_xid));
+               player_set_display(g_player[0], g_current_surface_type, GET_DISPLAY(selected_win_id));
                player_set_buffering_cb(g_player[0], buffering_cb, (void *)g_player[0]);
                player_set_completed_cb(g_player[0], completed_cb, (void *)g_player[0]);
                player_set_interrupted_cb(g_player[0], interrupted_cb, (void *)g_player[0]);
@@ -1094,7 +1082,7 @@ static void _player_play()
        if (g_current_surface_type == PLAYER_DISPLAY_TYPE_OVERLAY) {
 #ifdef _ACTIVATE_EOM_
                /* for checking external display.... */
-               player_set_display(g_player[0], g_current_surface_type, GET_DISPLAY(selected_xid));
+               player_set_display(g_player[0], g_current_surface_type, GET_DISPLAY(selected_win_id));
 #endif
                bRet = player_start(g_player[0]);
                g_print("player_start returned [%d]", bRet);
@@ -1135,7 +1123,7 @@ static void _player_resume()
        if (g_current_surface_type == PLAYER_DISPLAY_TYPE_OVERLAY) {
 #ifdef _ACTIVATE_EOM_
                /* for checking external display.... */
-               player_set_display(g_player[0], PLAYER_DISPLAY_TYPE_OVERLAY, GET_DISPLAY(selected_xid));
+               player_set_display(g_player[0], PLAYER_DISPLAY_TYPE_OVERLAY, GET_DISPLAY(selected_win_id));
 #endif
                bRet = player_start(g_player[0]);
                g_print("player_start returned [%d]", bRet);
@@ -1489,37 +1477,37 @@ static void change_surface(int option)
                        eom_get_output_mode(hdmi_output_id, &output_mode);
                        if (output_mode == EOM_OUTPUT_MODE_NONE) {
 #endif
-                               if (!g_xid) {
-                                       g_xid = create_win(PACKAGE);
-                                       if (g_xid == NULL)
+                               if (!g_win_id) {
+                                       g_win_id = create_win(PACKAGE);
+                                       if (g_win_id == NULL)
                                                return;
-                                       g_print("create xid %p\n", g_xid);
-                                       create_render_rect_and_bg(g_xid);
-                                       elm_win_activate(g_xid);
-                                       evas_object_show(g_xid);
-                                       g_xid = selected_xid;
+                                       g_print("create win_id %p\n", g_win_id);
+                                       create_render_rect_and_bg(g_win_id);
+                                       elm_win_activate(g_win_id);
+                                       evas_object_show(g_win_id);
+                                       g_win_id = selected_win_id;
                                }
 #ifdef _ACTIVATE_EOM_
                        } else {
                                /* for external */
                        }
 #endif
-                       ret = player_set_display(g_player[0], surface_type, GET_DISPLAY(selected_xid));
+                       ret = player_set_display(g_player[0], surface_type, GET_DISPLAY(selected_win_id));
                } else {
-                       if (!g_xid) {
-                               g_xid = create_win(PACKAGE);
-                               if (g_xid == NULL)
+                       if (!g_win_id) {
+                               g_win_id = create_win(PACKAGE);
+                               if (g_win_id == NULL)
                                        return;
-                               g_print("create xid %p\n", g_xid);
-                               create_render_rect_and_bg(g_xid);
-                               elm_win_activate(g_xid);
-                               evas_object_show(g_xid);
+                               g_print("create win_id %p\n", g_win_id);
+                               create_render_rect_and_bg(g_win_id);
+                               elm_win_activate(g_win_id);
+                               evas_object_show(g_win_id);
                        }
                        int i = 0;
                        for (i = 0; i < g_handle_num; i++) {
                                /* Create evas image object for EVAS surface */
                                if (!g_eo[i]) {
-                                       g_eo[i] = create_image_object(g_xid);
+                                       g_eo[i] = create_image_object(g_win_id);
                                        g_print("create eo[%d] %p\n", i, g_eo[i]);
                                        evas_object_image_size_set(g_eo[i], 500, 500);
                                        evas_object_image_fill_set(g_eo[i], 0, 0, 500, 500);