[vlc-commits] video_output: rename window_active to window_enabled

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Jun  4 13:28:12 2019 +0200| [4bc93e8e58d1f596788b583f890382f71913625a] | committer: Steve Lhomme

video_output: rename window_active to window_enabled

It always matches the Enabled state we set on the window.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4bc93e8e58d1f596788b583f890382f71913625a
---

 src/video_output/video_output.c  | 14 +++++++-------
 src/video_output/vout_internal.h |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index c941a3ded9..33c800d601 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1702,9 +1702,9 @@ void vout_Stop(vout_thread_t *vout)
         vout_StopDisplay(vout);
 
     vlc_mutex_lock(&sys->window_lock);
-    if (sys->window_active) {
+    if (sys->window_enabled) {
         vout_window_Disable(sys->display_cfg.window);
-        sys->window_active = false;
+        sys->window_enabled = false;
     }
     vlc_mutex_unlock(&sys->window_lock);
 }
@@ -1752,7 +1752,7 @@ void vout_Release(vout_thread_t *vout)
     vlc_mutex_destroy(&vout->p->spu_lock);
     vlc_mutex_destroy(&vout->p->filter.lock);
 
-    assert(!sys->window_active);
+    assert(!sys->window_enabled);
     vout_display_window_Delete(sys->display_cfg.window);
 
     vout_control_Clean(&vout->p->control);
@@ -1852,7 +1852,7 @@ vout_thread_t *vout_Create(vlc_object_t *object)
 
     if (sys->splitter_name != NULL)
         var_Destroy(vout, "window");
-    sys->window_active = false;
+    sys->window_enabled = false;
     vlc_mutex_init(&sys->window_lock);
 
     /* Arbitrary initial time */
@@ -1913,7 +1913,7 @@ int vout_Request(const vout_configuration_t *cfg, input_thread_t *input)
     sys->original = original;
 
     vlc_mutex_lock(&sys->window_lock);
-    if (!sys->window_active) {
+    if (!sys->window_enabled) {
         vout_window_cfg_t wcfg = {
             .is_fullscreen = var_GetBool(vout, "fullscreen"),
             .is_decorated = var_InheritBool(vout, "video-deco"),
@@ -1931,7 +1931,7 @@ int vout_Request(const vout_configuration_t *cfg, input_thread_t *input)
             vlc_mutex_unlock(&sys->window_lock);
             goto error;
         }
-        sys->window_active = true;
+        sys->window_enabled = true;
     } else
         vout_UpdateWindowSize(vout);
 
@@ -1946,7 +1946,7 @@ int vout_Request(const vout_configuration_t *cfg, input_thread_t *input)
     {
         vlc_mutex_lock(&sys->window_lock);
         vout_window_Disable(sys->display_cfg.window);
-        sys->window_active = false;
+        sys->window_enabled = false;
         vlc_mutex_unlock(&sys->window_lock);
         goto error;
     }
diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index 80b531ab77..939f33faba 100644
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -173,7 +173,7 @@ struct vout_thread_sys_t
     void            *mouse_opaque;
 
     /* Video output window */
-    bool            window_active;
+    bool            window_enabled;
     vlc_mutex_t     window_lock;
 
     /* Video output display */