[0.2.128] Remove TIZEN_FEATURE_EVAS_RENDERER feature

Change-Id: Ie9a12a3ca4da233728d165842e2b0da8b02a6ce3
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/legacy/CMakeLists.txt b/legacy/CMakeLists.txt
index 601de9d0d8589cfe65a5a9245819df7bb62022b4..578b72c1fbd21c56b2125a764a427257087eb29f 100644 (file)
--- a/legacy/CMakeLists.txt
+++ b/legacy/CMakeLists.txt
@@ -29,10 +29,6 @@ IF("${ARCH}" STREQUAL "arm")
     ADD_DEFINITIONS("-DTARGET")
 ENDIF("${ARCH}" STREQUAL "arm")
 
-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 d1df11acd9e79538987cc319582c88c0e6046c21..f00784329c9f2c5f46d8dd983d09b7194295e9a7 100644 (file)
--- a/legacy/include/legacy_player.h
+++ b/legacy/include/legacy_player.h
@@ -211,9 +211,7 @@ typedef enum {
        LEGACY_PLAYER_CALLBACK_TYPE_MEDIA_STREAM_AUDIO_SEEK,
        LEGACY_PLAYER_CALLBACK_TYPE_AUDIO_STREAM_CHANGED,
        LEGACY_PLAYER_CALLBACK_TYPE_VIDEO_STREAM_CHANGED,
-#ifdef TIZEN_FEATURE_EVAS_RENDERER
        LEGACY_PLAYER_CALLBACK_TYPE_RETURN_BUFFER,
-#endif
        LEGACY_PLAYER_CALLBACK_TYPE_SERVICE_DISCONNECTED,
        LEGACY_PLAYER_CALLBACK_TYPE_NUM
 } legacy_player_callback_type_e;

diff --git a/legacy/src/legacy_player.c b/legacy/src/legacy_player.c
index 5ce1c711e0542e480a28e6ead003f6fcd4c7a9a6..f8d3fcb0503a20912f8394c2e397f8c66ba5e95f 100644 (file)
--- a/legacy/src/legacy_player.c
+++ b/legacy/src/legacy_player.c
@@ -410,12 +410,10 @@ static int __lplayer_message_callback(int message, void *param, void *user_data)
                LOGD("Playback is completed.");
                __lplayer_default_callback(handle, LEGACY_PLAYER_CALLBACK_TYPE_COMPLETE);
                break;
-#ifdef TIZEN_FEATURE_EVAS_RENDERER
        case MM_MESSAGE_GAPLESS_CONSTRUCTION:   /* 0x105 */
                LOGD("Retrieve exported buffers.");
                __lplayer_default_callback(handle, LEGACY_PLAYER_CALLBACK_TYPE_RETURN_BUFFER);
                break;
-#endif
        case MM_MESSAGE_BUFFERING:      /* 0x103 */
                if (handle->user_cb[LEGACY_PLAYER_CALLBACK_TYPE_BUFFERING])
                        ((legacy_player_buffering_cb)handle->user_cb[LEGACY_PLAYER_CALLBACK_TYPE_BUFFERING]) \
@@ -544,10 +542,7 @@ static MMDisplaySurfaceType __lplayer_convert_display_type(player_display_type_e
        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
-               return MM_DISPLAY_SURFACE_REMOTE;
-#endif
+       case PLAYER_DISPLAY_TYPE_EVAS:  /* fall through */
        case PLAYER_DISPLAY_TYPE_NONE:  /* fall through */
        default:
                return MM_DISPLAY_SURFACE_NULL;

diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt
index 81781e49fc7872fc9d12bf1d31a198e87d55a775..e979905e2e043deba5f06090bd8008a8813e0b38 100644 (file)
--- a/muse/CMakeLists.txt
+++ b/muse/CMakeLists.txt
@@ -26,10 +26,6 @@ IF("${ARCH}" STREQUAL "arm")
     ADD_DEFINITIONS("-DTARGET")
 ENDIF("${ARCH}" STREQUAL "arm")
 
-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/muse/include/muse_player.h b/muse/include/muse_player.h
index ed3498b2585693de0053319df2f0c86c97934d15..c1d07c9cecc56e667a06dd46b3c54bb055989b84 100644 (file)
--- a/muse/include/muse_player.h
+++ b/muse/include/muse_player.h
@@ -81,9 +81,7 @@ typedef enum {
        MUSE_PLAYER_EVENT_TYPE_MEDIA_STREAM_AUDIO_SEEK,
        MUSE_PLAYER_EVENT_TYPE_AUDIO_STREAM_CHANGED,
        MUSE_PLAYER_EVENT_TYPE_VIDEO_STREAM_CHANGED,
-#ifdef TIZEN_FEATURE_EVAS_RENDERER
        MUSE_PLAYER_EVENT_TYPE_RETURN_BUFFER,
-#endif
        MUSE_PLAYER_EVENT_TYPE_SERVICE_DISCONNECTED,
        MUSE_PLAYER_EVENT_TYPE_NUM
 } muse_player_event_e;

diff --git a/muse/src/muse_player.c b/muse/src/muse_player.c
index 355d2626ae8d2962fbb23f7307651e86d10db399..251c3ab0a8f37ea0d665ee0fb22f8a7bb199cc26 100644 (file)
--- a/muse/src/muse_player.c
+++ b/muse/src/muse_player.c
@@ -885,9 +885,7 @@ static void *__mplayer_callback_function[MUSE_PLAYER_EVENT_TYPE_NUM] = {
        __mplayer_media_stream_seek_cb,              /* MUSE_PLAYER_EVENT_TYPE_MEDIA_STREAM_AUDIO_SEEK */
        NULL,                                        /* MUSE_PLAYER_EVENT_TYPE_AUDIO_STREAM_CHANGED */
        __mplayer_video_stream_changed_cb,           /* MUSE_PLAYER_EVENT_TYPE_VIDEO_STREAM_CHANGED */
-#ifdef TIZEN_FEATURE_EVAS_RENDERER
        __mplayer_default_callback,   /* MUSE_PLAYER_EVENT_TYPE_RETURN_BUFFER */
-#endif
        NULL,                         /* MUSE_PLAYER_EVENT_TYPE_SERVICE_DISCONNECTED */
 };
 

diff --git a/packaging/mmsvc-player.spec b/packaging/mmsvc-player.spec
index 5f764053ef751040e668bfb207e22dcf52870ce2..11dfa99ef8bcbc041f90c5fdbd82a05e6ddf844d 100644 (file)
--- 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.127
+Version:    0.2.128
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0
@@ -60,12 +60,7 @@ export LDFLAGS+=" -lgcov"
        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DFULLVER=%{version} \
        -DMAJORVER=${MAJORVER} \
-       -DBUILD_TESTS=%{?gtests:1}%{!?gtests:0} \
-%if "%{TIZEN_PRODUCT_TV}" == "1"
-    -DTIZEN_FEATURE_EVAS_RENDERER=Off
-%else
-    -DTIZEN_FEATURE_EVAS_RENDERER=On
-%endif
+       -DBUILD_TESTS=%{?gtests:1}%{!?gtests:0}
 
 make %{?jobs:-j%jobs}