e_comp: remove selcomp_delay_timer, selcomp_use_timer, selcomp_begin_timeout

Change-Id: I61ff8ccd10daab3778928296ec6fd2f6c39cfcf0
Signed-off-by: Juyeon Lee <juyeonne.lee@samsung.com>

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 4442fc7..b99f9f5 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -658,7 +658,7 @@ _e_comp_hwc_prepare(void)
              if ((ec->pixmap) && (e_pixmap_type_get(ec->pixmap) == E_PIXMAP_TYPE_EXT_OBJECT))
                 goto nextzone;
 
-             // if video client could not draw it on video hw layer
+             // if there is UI or video stream on subfrace, it means need to composite
              if (cdata && (cdata->sub.below_list || cdata->sub.below_list_pending))
                {
                   if (!e_comp_wl_video_client_has(ec))
@@ -753,7 +753,7 @@ _e_comp_hwc_begin(void)
    E_Zone *zone;
    Eina_Bool mode_set = EINA_FALSE;
 
-   E_FREE_FUNC(e_comp->selcomp_delay_timer, ecore_timer_del);
+   E_FREE_FUNC(e_comp->nocomp_delay_timer, ecore_timer_del);
 
    if (!e_comp->hwc) return;
    if (e_comp->hwc_override > 0) return;
@@ -777,7 +777,7 @@ _e_comp_hwc_begin(void)
 static Eina_Bool
 _e_comp_hwc_cb_begin_timeout(void *data EINA_UNUSED)
 {
-   e_comp->selcomp_delay_timer = NULL;
+   e_comp->nocomp_delay_timer = NULL;
 
    if (e_comp->hwc_override == 0 && _e_comp_hwc_usable())
      {
@@ -797,7 +797,7 @@ e_comp_hwc_end(const char *location)
    Eina_List *l;
 
    e_comp->selcomp_want = 0;
-   E_FREE_FUNC(e_comp->selcomp_delay_timer, ecore_timer_del);
+   E_FREE_FUNC(e_comp->nocomp_delay_timer, ecore_timer_del);
    _hwc_plane_reserved_clean();
 
    if (!e_comp->hwc) return;
@@ -935,11 +935,11 @@ setup_hwcompose:
         else
           {
              // switch mode
-             if (conf->selcomp_use_timer)
+             if (conf->nocomp_use_timer)
                {
-                  if (!e_comp->selcomp_delay_timer)
+                  if (!e_comp->nocomp_delay_timer)
                     {
-                       e_comp->selcomp_delay_timer = ecore_timer_add(conf->selcomp_begin_timeout,
+                       e_comp->nocomp_delay_timer = ecore_timer_add(conf->nocomp_begin_timeout,
                                                                      _e_comp_hwc_cb_begin_timeout,
                                                                      NULL);
                     }
@@ -1311,8 +1311,6 @@ _e_comp_free(E_Comp *c)
    if (c->screen_job) ecore_job_del(c->screen_job);
    if (c->nocomp_delay_timer) ecore_timer_del(c->nocomp_delay_timer);
    if (c->nocomp_override_timer) ecore_timer_del(c->nocomp_override_timer);
-   if (c->selcomp_delay_timer) ecore_timer_del(c->selcomp_delay_timer);
-   if (c->selcomp_override_timer) ecore_timer_del(c->selcomp_override_timer);
    ecore_job_del(c->shape_job);
 
    free(c);

diff --git a/src/bin/e_comp.h b/src/bin/e_comp.h
index 632574f..4f9562e 100644 (file)
--- a/src/bin/e_comp.h
+++ b/src/bin/e_comp.h
@@ -124,8 +124,6 @@ struct _E_Comp
    Ecore_Job      *screen_job;
    Ecore_Timer    *nocomp_delay_timer;
    Ecore_Timer    *nocomp_override_timer;
-   Ecore_Timer    *selcomp_delay_timer;
-   Ecore_Timer    *selcomp_override_timer;
    int             animating;
    double          frametimes[122];
    int             frameskip;

diff --git a/src/bin/e_comp_cfdata.c b/src/bin/e_comp_cfdata.c
index 455df04..340a878 100644 (file)
--- a/src/bin/e_comp_cfdata.c
+++ b/src/bin/e_comp_cfdata.c
@@ -52,8 +52,6 @@ e_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd)
    E_CONFIG_VAL(D, T, nocomp_fs, UCHAR);
    E_CONFIG_VAL(D, T, nocomp_use_timer, UCHAR);
    E_CONFIG_VAL(D, T, nocomp_begin_timeout, DOUBLE);
-   E_CONFIG_VAL(D, T, selcomp_use_timer, UCHAR);
-   E_CONFIG_VAL(D, T, selcomp_begin_timeout, DOUBLE);
    E_CONFIG_VAL(D, T, hwc, UCHAR);
    E_CONFIG_VAL(D, T, hwc_use_multi_plane, UCHAR);
    E_CONFIG_VAL(D, T, nofade, UCHAR);
@@ -114,8 +112,6 @@ e_comp_cfdata_config_new(void)
    cfg->nocomp_fs = 1;
    cfg->nocomp_use_timer = 1;
    cfg->nocomp_begin_timeout = 2.0;
-   cfg->selcomp_use_timer = 1;
-   cfg->selcomp_begin_timeout = 2.0;
    cfg->hwc = 0;
    cfg->hwc_use_multi_plane = 0;
    cfg->nofade = 0;

diff --git a/src/bin/e_comp_cfdata.h b/src/bin/e_comp_cfdata.h
index 72d247e..5b1d4db 100644 (file)
--- a/src/bin/e_comp_cfdata.h
+++ b/src/bin/e_comp_cfdata.h
@@ -29,8 +29,6 @@ struct _E_Comp_Config
    unsigned char nocomp_fs;
    unsigned char nocomp_use_timer;
    double        nocomp_begin_timeout;
-   unsigned char selcomp_use_timer;
-   double        selcomp_begin_timeout;
    unsigned char hwc;
    unsigned char hwc_use_multi_plane;
    unsigned char smooth_windows;