From 6f823a8c74b8156320557e9ea55bfabd5e76b8ec Mon Sep 17 00:00:00 2001 From: Eunhae Choi Date: Thu, 30 Jun 2016 18:30:56 +0900 Subject: [PATCH] apply tizen build option naming rule PLAYER_ASM_COMPATIBILITY to TIZEN_FEATURE_ASM EVAS_RENDERER_SUPPORT to TIZEN_FEATURE_EVAS_RENDERER Change-Id: I5c6b93b1bc9f7018d1c385bbc02687f818c6761a --- legacy/CMakeLists.txt | 6 +++--- legacy/include/legacy_player.h | 2 +- legacy/src/legacy_player.c | 14 +++++++------- legacy/test/legacy_player_test.c | 2 +- muse/src/muse_player.c | 2 +- packaging/mmsvc-player.spec | 8 ++++---- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/legacy/CMakeLists.txt b/legacy/CMakeLists.txt index fb6be20..6b46f2a 100644 --- a/legacy/CMakeLists.txt +++ b/legacy/CMakeLists.txt @@ -29,9 +29,9 @@ IF("${ARCH}" STREQUAL "arm") ADD_DEFINITIONS("-DTARGET") ENDIF("${ARCH}" STREQUAL "arm") -IF(EVAS_RENDERER_SUPPORT) - ADD_DEFINITIONS("-DEVAS_RENDERER_SUPPORT") -ENDIF(EVAS_RENDERER_SUPPORT) +IF(TIZEN_FEATURE_EVAS_RENDERER) + ADD_DEFINITIONS("-DTIZEN_FEATURE_EVAS_RENDERER") +ENDIF(TIZEN_FEATURE_EVAS_RENDERER) ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DTIZEN_DEBUG") diff --git a/legacy/include/legacy_player.h b/legacy/include/legacy_player.h index 55e0c27..dfa2885 100755 --- a/legacy/include/legacy_player.h +++ b/legacy/include/legacy_player.h @@ -118,7 +118,7 @@ typedef enum { */ typedef enum { PLAYER_DISPLAY_TYPE_OVERLAY = 0, /**< Overlay surface display */ -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER PLAYER_DISPLAY_TYPE_EVAS, /**< Evas image object surface display */ #endif PLAYER_DISPLAY_TYPE_NONE, /**< This disposes off buffers */ diff --git a/legacy/src/legacy_player.c b/legacy/src/legacy_player.c index 2ed74d7..a238fc8 100644 --- a/legacy/src/legacy_player.c +++ b/legacy/src/legacy_player.c @@ -33,7 +33,7 @@ #include #include #include -#ifdef PLAYER_ASM_COMPATIBILITY +#ifdef TIZEN_FEATURE_ASM #include #include #endif @@ -1044,7 +1044,7 @@ static MMDisplaySurfaceType __player_convet_display_type(player_display_type_e t switch (type) { case PLAYER_DISPLAY_TYPE_OVERLAY: return MM_DISPLAY_SURFACE_OVERLAY; -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER case PLAYER_DISPLAY_TYPE_EVAS: return MM_DISPLAY_SURFACE_REMOTE; #endif @@ -1424,7 +1424,7 @@ int legacy_player_get_volume(player_h player, float *left, float *right) return PLAYER_ERROR_NONE; } } -#ifdef PLAYER_ASM_COMPATIBILITY +#ifdef TIZEN_FEATURE_ASM int legacy_player_set_sound_type(player_h player, sound_type_e type) { PLAYER_INSTANCE_CHECK(player); @@ -1556,7 +1556,7 @@ int legacy_player_start(player_h player) int ret; if (handle->state == PLAYER_STATE_READY || handle->state == PLAYER_STATE_PAUSED) { if (handle->display_type == PLAYER_DISPLAY_TYPE_OVERLAY -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER || handle->display_type == PLAYER_DISPLAY_TYPE_EVAS #endif ) @@ -1614,7 +1614,7 @@ int legacy_player_stop(player_h player) int ret = mm_player_stop(handle->mm_handle); if (handle->display_type == PLAYER_DISPLAY_TYPE_OVERLAY -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER || handle->display_type == PLAYER_DISPLAY_TYPE_EVAS #endif ) { @@ -1858,7 +1858,7 @@ int legacy_player_set_display(player_h player, player_display_type_e type, playe handle->wl_display = (void *)ecore_wl_display_get(); set_wl_display = handle->wl_display; } -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER else if (type == PLAYER_DISPLAY_TYPE_EVAS && !strcmp(object_type, "image")) { /* evas object surface */ LOGI("evas surface type"); @@ -3147,7 +3147,7 @@ int legacy_player_set_display_wl_for_mused(player_h player, player_display_type_ handle->display_handle = (void *)(uintptr_t)wl_surface_id; set_handle = &(handle->display_handle); mmClientType = MM_DISPLAY_SURFACE_OVERLAY; -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER } else if (type == PLAYER_DISPLAY_TYPE_EVAS) { LOGI("Evas surface type"); set_handle = &(handle->display_handle); diff --git a/legacy/test/legacy_player_test.c b/legacy/test/legacy_player_test.c index 147e9b1..a961496 100644 --- a/legacy/test/legacy_player_test.c +++ b/legacy/test/legacy_player_test.c @@ -1095,7 +1095,7 @@ static void change_surface(int option) surface_type = PLAYER_DISPLAY_TYPE_OVERLAY; g_print("change surface type to X\n"); break; -#ifdef EVAS_RENDERER_SUPPORT +#ifdef TIZEN_FEATURE_EVAS_RENDERER case 1: /* EVAS surface */ surface_type = PLAYER_DISPLAY_TYPE_EVAS; diff --git a/muse/src/muse_player.c b/muse/src/muse_player.c index 807e7f7..704f87a 100644 --- a/muse/src/muse_player.c +++ b/muse/src/muse_player.c @@ -1146,7 +1146,7 @@ int player_disp_set_sound_type(muse_module_h module) muse_player = (muse_player_handle_s *)muse_core_ipc_get_handle(module); player_msg_get(type, muse_core_client_get_msg(module)); -#ifdef PLAYER_ASM_COMPATIBILITY +#ifdef TIZEN_FEATURE_ASM ret = legacy_player_set_sound_type(muse_player->player_handle, (sound_type_e)type); #endif player_msg_return(api, ret, module); diff --git a/packaging/mmsvc-player.spec b/packaging/mmsvc-player.spec index 7aa923a..1df4cf4 100644 --- a/packaging/mmsvc-player.spec +++ b/packaging/mmsvc-player.spec @@ -1,6 +1,6 @@ Name: mmsvc-player Summary: A Media Player module for muse server -Version: 0.2.17 +Version: 0.2.18 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 @@ -52,13 +52,13 @@ export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE" export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE" export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" %endif -export CFLAGS+=" -DPLAYER_ASM_COMPATIBILITY" +export CFLAGS+=" -DTIZEN_FEATURE_ASM" MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` %cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} \ %if "%{?profile}" == "tv" || "%{?profile}" == "wearable" - -DEVAS_RENDERER_SUPPORT=Off + -DTIZEN_FEATURE_EVAS_RENDERER=Off %else - -DEVAS_RENDERER_SUPPORT=On + -DTIZEN_FEATURE_EVAS_RENDERER=On %endif make %{?jobs:-j%jobs} -- 2.7.4