diff options
author | NAMJEONGYOON <just.nam@samsung.com> | 2016-11-03 17:19:34 +0900 |
---|---|---|
committer | NAMJEONGYOON <just.nam@samsung.com> | 2016-11-03 17:19:34 +0900 |
commit | d596c25ab85093445d11e25983c5f88e320be943 (patch) | |
tree | 794da810b50787a46ca158e76c29c93c55907b73 | |
parent | b282704cbcc552891c0feb3cf97d6286f4d88ec1 (diff) | |
download | libmm-player-d596c25ab85093445d11e25983c5f88e320be943.tar.gz libmm-player-d596c25ab85093445d11e25983c5f88e320be943.tar.bz2 libmm-player-d596c25ab85093445d11e25983c5f88e320be943.zip |
[v0.6.10] remove evas from ini
Change-Id: I92030725f377357f23c3e1ece5c896a41a2d2dda
-rw-r--r-- | src/include/mm_player_ini.h | 1 | ||||
-rw-r--r-- | src/mm_player_attrs.c | 12 | ||||
-rw-r--r-- | src/mm_player_ini.c | 3 | ||||
-rw-r--r-- | src/mm_player_priv.c | 2 |
4 files changed, 1 insertions, 17 deletions
diff --git a/src/include/mm_player_ini.h b/src/include/mm_player_ini.h index 145d982..b5840bb 100644 --- a/src/include/mm_player_ini.h +++ b/src/include/mm_player_ini.h @@ -59,7 +59,6 @@ enum keyword_type { typedef struct __mm_player_ini { /* general */ gchar videosink_element_overlay[PLAYER_INI_MAX_STRLEN]; - gchar videosink_element_evas[PLAYER_INI_MAX_STRLEN]; gchar videosink_element_fake[PLAYER_INI_MAX_STRLEN]; gchar videoconverter_element[PLAYER_INI_MAX_STRLEN]; gchar videocodec_element_hw[PLAYER_INI_MAX_STRLEN]; diff --git a/src/mm_player_attrs.c b/src/mm_player_attrs.c index a56b4e8..5a22ceb 100644 --- a/src/mm_player_attrs.c +++ b/src/mm_player_attrs.c @@ -227,7 +227,6 @@ __mmplayer_apply_attribute(MMHandleType handle, const char *attribute_name) MMHandleType _mmplayer_construct_attribute(MMHandleType handle) { - mm_player_t *player = NULL; int idx = 0; MMHandleType attrs = 0; int num_of_attrs = 0; @@ -235,8 +234,6 @@ _mmplayer_construct_attribute(MMHandleType handle) MMPLAYER_RETURN_VAL_IF_FAIL(handle, 0); - player = MM_PLAYER_CAST(handle); - MMPlayerAttrsSpec player_attrs[] = { { "profile_uri", // name @@ -803,15 +800,6 @@ _mmplayer_construct_attribute(MMHandleType handle) MM_DISPLAY_SURFACE_NUM - 1 }, { - "display_evas_surface_sink", - MM_ATTRS_TYPE_STRING, - MM_ATTRS_FLAG_READABLE, - (void *) player->ini.videosink_element_evas, - MM_ATTRS_VALID_TYPE_NONE, - 0, - 0 - }, - { "display_force_aspect_ration", MM_ATTRS_TYPE_INT, MM_ATTRS_FLAG_RW, diff --git a/src/mm_player_ini.c b/src/mm_player_ini.c index 6f025e6..886cdb4 100644 --- a/src/mm_player_ini.c +++ b/src/mm_player_ini.c @@ -153,7 +153,6 @@ mm_player_ini_load(mm_player_ini_t* ini) ini->video_bo_timeout = iniparser_getint(dict, "general:video bo timeout", DEFAULT_TIMEOUT_OF_VIDEO_BO); MMPLAYER_INI_GET_STRING(dict, ini->videosink_element_overlay, "general:videosink element overlay", DEFAULT_VIDEOSINK_OVERLAY); - MMPLAYER_INI_GET_STRING(dict, ini->videosink_element_evas, "general:videosink element evas", DEFAULT_VIDEOSINK_EVAS); MMPLAYER_INI_GET_STRING(dict, ini->videosink_element_fake, "general:videosink element fake", DEFAULT_VIDEOSINK_FAKE); MMPLAYER_INI_GET_STRING(dict, ini->audioresampler_element, "general:audio resampler element", DEFAULT_AUDIORESAMPLER); MMPLAYER_INI_GET_STRING(dict, ini->audiosink_element, "general:audiosink element", DEFAULT_AUDIOSINK); @@ -191,7 +190,6 @@ mm_player_ini_load(mm_player_ini_t* ini) ini->disable_segtrap = DEFAULT_DISABLE_SEGTRAP; ini->skip_rescan = DEFAULT_SKIP_RESCAN; strncpy(ini->videosink_element_overlay, DEFAULT_VIDEOSINK_OVERLAY, PLAYER_INI_MAX_STRLEN - 1); - strncpy(ini->videosink_element_evas, DEFAULT_VIDEOSINK_EVAS, PLAYER_INI_MAX_STRLEN - 1); strncpy(ini->videosink_element_fake, DEFAULT_VIDEOSINK_FAKE, PLAYER_INI_MAX_STRLEN - 1); ini->generate_dot = DEFAULT_GENERATE_DOT; ini->use_system_clock = DEFAULT_USE_SYSTEM_CLOCK; @@ -242,7 +240,6 @@ mm_player_ini_load(mm_player_ini_t* ini) LOGD("disable segtrap : %d\n", ini->disable_segtrap); LOGD("skip rescan : %d\n", ini->skip_rescan); LOGD("videosink element overlay: %s\n", ini->videosink_element_overlay); - LOGD("videosink element evas: %s\n", ini->videosink_element_evas); LOGD("videosink element fake: %s\n", ini->videosink_element_fake); LOGD("video converter element : %s\n", ini->videoconverter_element); LOGD("video codec element(hw) : %s\n", ini->videocodec_element_hw); diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c index 51d318f..f897c39 100644 --- a/src/mm_player_priv.c +++ b/src/mm_player_priv.c @@ -13555,7 +13555,7 @@ int _mmplayer_change_videosink(MMHandleType handle, MMDisplaySurfaceType surface klass = gst_element_factory_get_metadata(decfactory, GST_ELEMENT_METADATA_KLASS); if ((g_strrstr(klass, "Codec/Decoder/Video"))) { if ((prev_display_surface_type == MM_DISPLAY_SURFACE_OVERLAY) && (surface_type == MM_DISPLAY_SURFACE_REMOTE)) { - ret = __mmplayer_do_change_videosink(player, MMPLAYER_M_DEC1+i, player->ini.videosink_element_evas, surface_type, display_overlay); + ret = __mmplayer_do_change_videosink(player, MMPLAYER_M_DEC1+i, "fakesink", surface_type, display_overlay); if (ret) { goto ERROR_CASE; } else { |