enable evas renderer except wearable/tv profile

Change-Id: Ie248562f20146bbdea0c12f537554186a8ba0bb7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db74aca..ccec471 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,11 +16,11 @@ ENDIF (TIZEN_WEARABLE)
 SET(INC_COM_DIR include)
 
 INCLUDE_DIRECTORIES(${INC_DIR}, ${INC_COM_DIR})
-IF (TIZEN_MOBILE)
+IF (EVAS_RENDERER_SUPPORT)
 SET(dependents "dlog glib-2.0 libtbm capi-media-tool capi-media-sound-manager capi-base-common mused mm-common tizen-extension-client evas ecore elementary mm-evas-renderer")
-ELSE (TIZEN_MOBILE)
+ELSE (EVAS_RENDERER_SUPPORT)
 SET(dependents "dlog glib-2.0 libtbm capi-media-tool capi-media-sound-manager capi-base-common mused mm-common tizen-extension-client evas ecore elementary")
-ENDIF (TIZEN_MOBILE)
+ENDIF (EVAS_RENDERER_SUPPORT)
 SET(pc_dependents "libtbm capi-media-tool capi-base-common capi-media-sound-manager")
 
 INCLUDE(FindPkgConfig)
@@ -47,14 +47,13 @@ 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)
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DTIZEN_DEBUG")
 
-IF (TIZEN_MOBILE)
-ADD_DEFINITIONS("-DTIZEN_MOBILE")
-ENDIF(TIZEN_MOBILE)
-
 IF (TIZEN_TV)
 ADD_DEFINITIONS("-DTIZEN_TV")
 ENDIF(TIZEN_TV)

diff --git a/packaging/capi-media-player.spec b/packaging/capi-media-player.spec
index 206c0cd..8b08723 100644 (file)
--- a/packaging/capi-media-player.spec
+++ b/packaging/capi-media-player.spec
@@ -3,7 +3,7 @@
 
 Name:       capi-media-player
 Summary:    A Media Player API
-Version:    0.3.9
+Version:    0.3.10
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
@@ -32,7 +32,7 @@ BuildRequires:  pkgconfig(mmsvc-player)
 BuildRequires:  pkgconfig(json-c)
 BuildRequires:  pkgconfig(libtbm)
 BuildRequires:  pkgconfig(eom)
-%if "%{?profile}" == "mobile"
+%if "%{?profile}" != "tv" && "%{?profile}" != "wearable"
 BuildRequires:  pkgconfig(mm-evas-renderer)
 %endif
 
@@ -64,13 +64,10 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 %endif
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} \
+%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} \
 %if "%{?profile}" == "wearable"
        -DTIZEN_WEARABLE=YES \
 %endif
-%if "%{?profile}" == "mobile"
-    -DTIZEN_MOBILE=YES \
-%endif
 %if "%{?profile}" == "tv"
     -DTIZEN_TV=YES \
 %endif
@@ -84,8 +81,11 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %else
     -DX11_SUPPORT=Off \
 %endif
-    -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} \
-    -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+%if "%{?profile}" == "tv" || "%{?profile}" == "wearable"
+       -DEVAS_RENDERER_SUPPORT=Off
+%else
+       -DEVAS_RENDERER_SUPPORT=On
+%endif
 
 make %{?jobs:-j%jobs}
 

diff --git a/src/player.c b/src/player.c
index 888fac7..ad9fa80 100644 (file)
--- a/src/player.c
+++ b/src/player.c
@@ -41,7 +41,7 @@
 #include "player_internal.h"
 #include "player_private.h"
 #include "player_msg.h"
-#ifdef TIZEN_MOBILE
+#ifdef EVAS_RENDERER_SUPPORT
 #include <mm_evas_renderer.h>
 #endif
 #define INVALID_SOCKET -1
@@ -1327,7 +1327,7 @@ int player_destroy(player_h player)
        LOGD("ENTER");
 
        player_msg_send(api, pc, ret_buf, ret);
-#ifdef TIZEN_MOBILE
+#ifdef EVAS_RENDERER_SUPPORT
        if (EVAS_HANDLE(pc)) {
                player_unset_media_packet_video_frame_decoded_cb(player);
                if (mm_evas_renderer_destroy(&EVAS_HANDLE(pc)) != MM_ERROR_NONE)
@@ -1425,7 +1425,7 @@ int player_unprepare(player_h player)
 
        if (!CALLBACK_INFO(pc))
                return PLAYER_ERROR_INVALID_STATE;
-#ifdef TIZEN_MOBILE
+#ifdef EVAS_RENDERER_SUPPORT
        if (EVAS_HANDLE(pc)) {
                player_unset_media_packet_video_frame_decoded_cb(player);
                if (mm_evas_renderer_destroy(&EVAS_HANDLE(pc)) != MM_ERROR_NONE)
@@ -1705,7 +1705,7 @@ int player_start(player_h player)
        char *ret_buf = NULL;
 
        LOGD("ENTER");
-#ifdef TIZEN_MOBILE
+#ifdef EVAS_RENDERER_SUPPORT
        if (EVAS_HANDLE(pc)) {
                ret = mm_evas_renderer_update_param(EVAS_HANDLE(pc));
                if (ret != PLAYER_ERROR_NONE)
@@ -1990,7 +1990,7 @@ int player_set_display(player_h player, player_display_type_e type, player_displ
                                xhandle = elm_win_xwindow_get(obj);
 #endif
                        }
-#ifdef TIZEN_MOBILE
+#ifdef EVAS_RENDERER_SUPPORT
                        else if (type == PLAYER_DISPLAY_TYPE_EVAS && !strcmp(object_type, "image")) {
                                /* evas object surface */
                                LOGI("evas surface type");
@@ -2044,7 +2044,7 @@ int player_set_display_mode(player_h player, player_display_mode_e mode)
        char *ret_buf = NULL;
 
        LOGD("ENTER");
-#ifdef TIZEN_MOBILE
+#ifdef EVAS_RENDERER_SUPPORT
        if (EVAS_HANDLE(pc)) {
                ret = mm_evas_renderer_set_geometry(EVAS_HANDLE(pc), mode);
                return ret;
@@ -2066,7 +2066,7 @@ int player_get_display_mode(player_h player, player_display_mode_e * pmode)
        int mode = -1;
 
        LOGD("ENTER");
-#ifdef TIZEN_MOBILE
+#ifdef EVAS_RENDERER_SUPPORT
        if (EVAS_HANDLE(pc)) {
                ret = mm_evas_renderer_get_geometry(EVAS_HANDLE(pc), &mode);
                *pmode = (player_display_mode_e) mode;
@@ -2108,7 +2108,7 @@ int player_set_display_rotation(player_h player, player_display_rotation_e rotat
        char *ret_buf = NULL;
 
        LOGD("ENTER");
-#ifdef TIZEN_MOBILE
+#ifdef EVAS_RENDERER_SUPPORT
        if (EVAS_HANDLE(pc)) {
                ret = mm_evas_renderer_set_rotation(EVAS_HANDLE(pc), rotation);
                return ret;
@@ -2130,7 +2130,7 @@ int player_get_display_rotation(player_h player, player_display_rotation_e * pro
        int rotation = -1;
 
        LOGD("ENTER");
-#ifdef TIZEN_MOBILE
+#ifdef EVAS_RENDERER_SUPPORT
        if (EVAS_HANDLE(pc)) {
                ret = mm_evas_renderer_get_rotation(EVAS_HANDLE(pc), &rotation);
                *protation = (player_display_rotation_e) rotation;
@@ -2156,7 +2156,7 @@ int player_set_display_visible(player_h player, bool visible)
        char *ret_buf = NULL;
 
        LOGD("ENTER");
-#ifdef TIZEN_MOBILE
+#ifdef EVAS_RENDERER_SUPPORT
        if (EVAS_HANDLE(pc)) {
                ret = mm_evas_renderer_set_visible(EVAS_HANDLE(pc), visible);
                return ret;
@@ -2176,11 +2176,11 @@ int player_is_display_visible(player_h player, bool * pvisible)
        muse_player_api_e api = MUSE_PLAYER_API_IS_DISPLAY_VISIBLE;
        char *ret_buf = NULL;
        int value = -1;
-#ifdef TIZEN_MOBILE
+#ifdef EVAS_RENDERER_SUPPORT
        bool visible = 0;
 #endif
        LOGD("ENTER");
-#ifdef TIZEN_MOBILE
+#ifdef EVAS_RENDERER_SUPPORT
        if (EVAS_HANDLE(pc)) {
                ret = mm_evas_renderer_get_visible(EVAS_HANDLE(pc), &visible);
                if (visible)

diff --git a/test/player_test.c b/test/player_test.c
index cf69c64..ffd0c7d 100644 (file)
--- a/test/player_test.c
+++ b/test/player_test.c
@@ -1452,7 +1452,7 @@ static void change_surface(int option)
                surface_type = PLAYER_DISPLAY_TYPE_OVERLAY;
                g_print("change surface type to X\n");
                break;
-#ifdef TIZEN_MOBILE
+#ifdef EVAS_RENDERER_SUPPORT
        case 1:
                /* EVAS surface */
                surface_type = PLAYER_DISPLAY_TYPE_EVAS;