Replace deprecated overlay with new overlay 18/57918/1 accepted/tizen/mobile/20160127.004308 accepted/tizen/tv/20160127.004523 accepted/tizen/wearable/20160127.004730 submit/tizen/20160126.083631
authorHyunjun Ko <zzoon.ko@samsung.com>
Tue, 26 Jan 2016 05:15:40 +0000 (14:15 +0900)
committerHyunjun Ko <zzoon.ko@samsung.com>
Tue, 26 Jan 2016 05:15:40 +0000 (14:15 +0900)
Change-Id: Id1755207423dd6b874002794d712c5cbbcd5c891

common/mm_wfd_attrs.c
sink/mm_wfd_sink_priv.c

index 79b3b2316f0072aea36b7265b9428cf22cbac803..7c61620e030f35b67798e7456f11632486e0980c 100755 (executable)
@@ -254,10 +254,9 @@ _mmwfd_construct_attribute(MMHandleType handle)
                        (char *)"display_surface_type",
                        MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
-                       (void *) MM_DISPLAY_SURFACE_X,
+                       (void *) MM_DISPLAY_SURFACE_OVERLAY,
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
-                       MM_DISPLAY_SURFACE_X,
-                       MM_DISPLAY_SURFACE_X_EXT
+                       MM_DISPLAY_SURFACE_OVERLAY
                },
                {
                        (char *)"display_width",   /* dest width of fimcconvert ouput */
index 04ae189598b786e99a6656a059e098cee21b4315..1e60abc5b2c689b0311e9fcde9d24eeb51aed477 100755 (executable)
@@ -2928,7 +2928,7 @@ static int __mm_wfd_sink_prepare_videodec(mm_wfd_sink_t *wfd_sink, GstElement *v
 static int __mm_wfd_sink_prepare_videosink(mm_wfd_sink_t *wfd_sink, GstElement *video_sink)
 {
        gboolean visible = TRUE;
-       gint surface_type = MM_DISPLAY_SURFACE_X;
+       gint surface_type = MM_DISPLAY_SURFACE_OVERLAY;
 
        wfd_sink_debug_fenter();
 
@@ -2961,7 +2961,7 @@ static int __mm_wfd_sink_prepare_videosink(mm_wfd_sink_t *wfd_sink, GstElement *
                        }
                        break;
 
-               case MM_DISPLAY_SURFACE_X: {
+               case MM_DISPLAY_SURFACE_OVERLAY: {
                                void *object = NULL;
                                Evas_Object *obj = NULL;
                                const char *object_type = NULL;
@@ -3293,7 +3293,7 @@ static int __mm_wfd_sink_create_video_sinkbin(mm_wfd_sink_t *wfd_sink)
        GstPad *pad = NULL;
        GstPad *ghostpad = NULL;
        gint i = 0;
-       gint surface_type = MM_DISPLAY_SURFACE_X;
+       gint surface_type = MM_DISPLAY_SURFACE_OVERLAY;
 
        wfd_sink_debug_fenter();
 
@@ -3337,7 +3337,7 @@ static int __mm_wfd_sink_create_video_sinkbin(mm_wfd_sink_t *wfd_sink)
        /* create sink */
        mm_attrs_get_int_by_name(wfd_sink->attrs, "display_surface_type", &surface_type);
 
-       if (surface_type == MM_DISPLAY_SURFACE_X) {
+       if (surface_type == MM_DISPLAY_SURFACE_OVERLAY) {
                MMWFDSINK_CREATE_ELEMENT(v_sinkbin, WFD_SINK_V_S_SINK, wfd_sink->ini.name_of_video_sink, "video_sink", TRUE);
        } else if (surface_type == MM_DISPLAY_SURFACE_EVAS) {
                MMWFDSINK_CREATE_ELEMENT(v_sinkbin, WFD_SINK_V_S_SINK, wfd_sink->ini.name_of_video_evas_sink, "video_sink", TRUE);