videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

video_output: rename window_active to window_enabled 

It always matches the Enabled state we set on the window.
This commit is contained in:
Steve Lhomme 2019-06-04 13:28:12 +02:00
parent 5c2e5221f5
commit 4bc93e8e58
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/video_output/video_output.c
View File

@ -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;
}

2
src/video_output/vout_internal.h
View File

@ -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 */