[vlc-devel] [PATCH 07/10] vout: control: remove always false is_waiting

[Steve Lhomme]

---
 src/video_output/control.c      | 3 +--
 src/video_output/control.h      | 1 -
 src/video_output/video_output.c | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/video_output/control.c b/src/video_output/control.c
index 21b99efb326..73d839f90e6 100644
--- a/src/video_output/control.c
+++ b/src/video_output/control.c
@@ -48,7 +48,6 @@ void vout_control_Init(vout_control_t *ctrl)
     vlc_cond_init(&ctrl->wait_available);
 
     ctrl->is_held = false;
-    ctrl->is_waiting = false;
     ctrl->is_dead = false;
     ctrl->can_sleep = true;
     ARRAY_INIT(ctrl->cmd);
@@ -125,7 +124,7 @@ void vout_control_PushMouse(vout_control_t *ctrl, int type, const vlc_mouse_t *m
 void vout_control_Hold(vout_control_t *ctrl)
 {
     vlc_mutex_lock(&ctrl->lock);
-    while (ctrl->is_held || !ctrl->is_waiting)
+    while (ctrl->is_held)
         vlc_cond_wait(&ctrl->wait_available, &ctrl->lock);
     ctrl->is_held = true;
     vlc_mutex_unlock(&ctrl->lock);
diff --git a/src/video_output/control.h b/src/video_output/control.h
index 55503f826d7..01707cdd515 100644
--- a/src/video_output/control.h
+++ b/src/video_output/control.h
@@ -54,7 +54,6 @@ typedef struct {
     /* */
     bool is_dead;
     bool can_sleep;
-    bool is_waiting;
     bool is_held;
     DECL_ARRAY(vout_control_cmd_t) cmd;
 } vout_control_t;
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 6b12e492ffe..15a2d226308 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -486,7 +486,6 @@ void vout_PutPicture(vout_thread_t *vout, picture_t *picture)
     assert(!sys->dummy);
     picture->p_next = NULL;
     picture_fifo_Push(sys->decoder_fifo, picture);
-    vout_control_Wake(&sys->control);
 }
 
 /* */
-- 
2.26.2