[v0.2.36] modify about evas renderer feature option

Change-Id: Ic3f775537278c4abca85e6c3c7f6b78cd8e9c4e0
Signed-off-by: Eunhae Choi <eunhae1.choi@samsung.com>
(cherry picked from commit 6015b10aef2edfe5c97675ede953ecd2ff2b38b4)

diff --git a/legacy/include/legacy_player.h b/legacy/include/legacy_player.h
index fc91c4e6fc256aa0fb7204050caa6be81ac8f4a4..e8bb0b791c52da4be3d589d23194e0de286e5206 100644 (file)
--- a/legacy/include/legacy_player.h
+++ b/legacy/include/legacy_player.h
@@ -117,9 +117,7 @@ typedef enum {
  */
 typedef enum {
     PLAYER_DISPLAY_TYPE_OVERLAY = 0,    /**< Overlay surface display */
-#ifdef TIZEN_FEATURE_EVAS_RENDERER
     PLAYER_DISPLAY_TYPE_EVAS,           /**< Evas image object surface display */
-#endif
     PLAYER_DISPLAY_TYPE_NONE,           /**< This disposes off buffers */
 } player_display_type_e;
 

diff --git a/legacy/src/legacy_player.c b/legacy/src/legacy_player.c
index d916282d6ca3ef5b1f07f57a58588f97c7f55681..ebbd66ad1fc338841181bd1e47d3eaaf233fcd7a 100644 (file)
--- a/legacy/src/legacy_player.c
+++ b/legacy/src/legacy_player.c
@@ -1074,12 +1074,11 @@ static MMDisplaySurfaceType __player_convet_display_type(player_display_type_e t
        switch (type) {
        case PLAYER_DISPLAY_TYPE_OVERLAY:
                return MM_DISPLAY_SURFACE_OVERLAY;
+       case PLAYER_DISPLAY_TYPE_EVAS: /* fall through ifndef TIZEN_FEATURE_EVAS_RENDERER */
 #ifdef TIZEN_FEATURE_EVAS_RENDERER
-       case PLAYER_DISPLAY_TYPE_EVAS:
                return MM_DISPLAY_SURFACE_REMOTE;
 #endif
-       case PLAYER_DISPLAY_TYPE_NONE:
-               return MM_DISPLAY_SURFACE_NULL;
+       case PLAYER_DISPLAY_TYPE_NONE:  /* fall through */
        default:
                return MM_DISPLAY_SURFACE_NULL;
        }
@@ -1585,15 +1584,8 @@ int legacy_player_start(player_h player)
        player_s *handle = (player_s *)player;
        int ret;
        if (handle->state == PLAYER_STATE_READY || handle->state == PLAYER_STATE_PAUSED) {
-               if (handle->display_type == PLAYER_DISPLAY_TYPE_OVERLAY
-#ifdef TIZEN_FEATURE_EVAS_RENDERER
-                       || handle->display_type == PLAYER_DISPLAY_TYPE_EVAS
-#endif
-                       ) {
-
-                       if (handle->is_display_visible)
-                               ret = mm_player_set_attribute(handle->mm_handle, NULL, "display_visible", 1, (char *)NULL);
-               }
+               if (handle->display_type == PLAYER_DISPLAY_TYPE_OVERLAY && handle->is_display_visible)
+                       ret = mm_player_set_attribute(handle->mm_handle, NULL, "display_visible", 1, (char *)NULL);
 
                if (handle->is_stopped) {
                        if (handle->is_progressive_download) {
@@ -1632,13 +1624,8 @@ int legacy_player_stop(player_h player)
        if (handle->state == PLAYER_STATE_PLAYING || handle->state == PLAYER_STATE_PAUSED) {
                int ret = mm_player_stop(handle->mm_handle);
 
-               if (handle->display_type == PLAYER_DISPLAY_TYPE_OVERLAY
-#ifdef TIZEN_FEATURE_EVAS_RENDERER
-                       || handle->display_type == PLAYER_DISPLAY_TYPE_EVAS
-#endif
-                       ) {
+               if (handle->display_type == PLAYER_DISPLAY_TYPE_OVERLAY)
                        ret = mm_player_set_attribute(handle->mm_handle, NULL, "display_visible", 0, (char *)NULL);
-               }
 
                if (ret != MM_ERROR_NONE) {
                        return __player_convert_error_code(ret, (char *)__FUNCTION__);