e_comp: use hwc_override instead of nocomp_override

Change-Id: I94049f411ab1f279f798dd8186d76bfd9591d29d

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index b0fc84c405678fa55494b949820173292a4cd8ff..d7bfdddbb8448c8215029ff9e295c173ea81d7c3 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -358,7 +358,7 @@ _e_comp_cb_nocomp_begin_timeout(void *data EINA_UNUSED)
 {
    e_comp->nocomp_delay_timer = NULL;
 
-   if (e_comp->nocomp_override == 0)
+   if (e_comp->hwc_override == 0)
      {
         if (_e_comp_fullscreen_check()) e_comp->nocomp_want = 1;
         _e_comp_cb_nocomp_begin();
@@ -910,7 +910,7 @@ setup_hwcompose:
                   if (!e_comp_is_on_overlay(ec))
                     e_comp_nocomp_end("_e_comp_cb_update : nocomp_ec != ec");
                }
-             else if ((!e_comp->nocomp) && (!e_comp->nocomp_override))
+             else if ((!e_comp->nocomp) && (!e_comp->hwc_override))
                {
                   if (conf->nocomp_use_timer)
                     {
@@ -1277,11 +1277,11 @@ static Eina_Bool
 _e_comp_override_expire(void *data EINA_UNUSED)
 {
    e_comp->nocomp_override_timer = NULL;
-   e_comp->nocomp_override--;
+   e_comp->hwc_override--;
 
-   if (e_comp->nocomp_override <= 0)
+   if (e_comp->hwc_override <= 0)
      {
-        e_comp->nocomp_override = 0;
+        e_comp->hwc_override = 0;
         if (e_comp->nocomp_want) _e_comp_cb_nocomp_begin();
      }
    return EINA_FALSE;
@@ -1651,10 +1651,10 @@ e_comp_ignore_win_find(Ecore_Window win)
 E_API void
 e_comp_override_del()
 {
-   e_comp->nocomp_override--;
-   if (e_comp->nocomp_override <= 0)
+   e_comp->hwc_override--;
+   if (e_comp->hwc_override <= 0)
      {
-        e_comp->nocomp_override = 0;
+        e_comp->hwc_override = 0;
         if (e_comp->nocomp_want) _e_comp_cb_nocomp_begin();
      }
 }
@@ -1662,8 +1662,8 @@ e_comp_override_del()
 E_API void
 e_comp_override_add()
 {
-   e_comp->nocomp_override++;
-   if ((e_comp->nocomp_override > 0) && (e_comp->nocomp)) e_comp_nocomp_end(__FUNCTION__);
+   e_comp->hwc_override++;
+   if ((e_comp->hwc_override > 0) && (e_comp->nocomp)) e_comp_nocomp_end(__FUNCTION__);
 }
 
 E_API E_Comp *
@@ -1676,9 +1676,9 @@ e_comp_find_by_window(Ecore_Window win)
 E_API void
 e_comp_override_timed_pop(void)
 {
-   if (e_comp->nocomp_override <= 0) return;
+   if (e_comp->hwc_override <= 0) return;
    if (e_comp->nocomp_override_timer)
-     e_comp->nocomp_override--;
+     e_comp->hwc_override--;
    else
      e_comp->nocomp_override_timer = ecore_timer_add(1.0, _e_comp_override_expire, NULL);
 }

diff --git a/src/bin/e_comp.h b/src/bin/e_comp.h
index d74c907faf870735add0708863f36b35d0506bcc..5b642024fd690214f4bd1a50e745695c9be3d32e 100644 (file)
--- a/src/bin/e_comp.h
+++ b/src/bin/e_comp.h
@@ -131,7 +131,6 @@ struct _E_Comp
    int             frameskip;
    double          fps;
 
-   int             nocomp_override; //number of times nocomp override has been requested
    Ecore_Window    block_win;
    int             block_count; //number of times block window has been requested