[vlc-devel] [PATCH 08/10] vout: control: remove write only code

[Steve Lhomme]

- can_sleep is write only
- wait_request is write only
- so vout_control_Wake() doesn't do anything useful anymore (we are not blocking the pop call, only when the control is held by another thread)
---
 src/video_output/control.c | 12 ------------
 src/video_output/control.h |  3 ---
 2 files changed, 15 deletions(-)

diff --git a/src/video_output/control.c b/src/video_output/control.c
index 73d839f90e6..40f71e81300 100644
--- a/src/video_output/control.c
+++ b/src/video_output/control.c
@@ -44,12 +44,10 @@ void vout_control_cmd_Clean(vout_control_cmd_t *cmd)
 void vout_control_Init(vout_control_t *ctrl)
 {
     vlc_mutex_init(&ctrl->lock);
-    vlc_cond_init(&ctrl->wait_request);
     vlc_cond_init(&ctrl->wait_available);
 
     ctrl->is_held = false;
     ctrl->is_dead = false;
-    ctrl->can_sleep = true;
     ARRAY_INIT(ctrl->cmd);
 }
 
@@ -75,21 +73,12 @@ static void vout_control_Push(vout_control_t *ctrl, vout_control_cmd_t *cmd)
     vlc_mutex_lock(&ctrl->lock);
     if (!ctrl->is_dead) {
         ARRAY_APPEND(ctrl->cmd, *cmd);
-        vlc_cond_signal(&ctrl->wait_request);
     } else {
         vout_control_cmd_Clean(cmd);
     }
     vlc_mutex_unlock(&ctrl->lock);
 }
 
-void vout_control_Wake(vout_control_t *ctrl)
-{
-    vlc_mutex_lock(&ctrl->lock);
-    ctrl->can_sleep = false;
-    vlc_cond_signal(&ctrl->wait_request);
-    vlc_mutex_unlock(&ctrl->lock);
-}
-
 void vout_control_PushVoid(vout_control_t *ctrl, int type)
 {
     vout_control_Push(ctrl, &(vout_control_cmd_t) {
@@ -153,7 +142,6 @@ int vout_control_Pop(vout_control_t *ctrl, vout_control_cmd_t *cmd)
         ARRAY_REMOVE(ctrl->cmd, 0);
     } else {
         ret = VLC_EGENERIC;
-        ctrl->can_sleep = true;
     }
     vlc_mutex_unlock(&ctrl->lock);
 
diff --git a/src/video_output/control.h b/src/video_output/control.h
index 01707cdd515..ccdd3eb2ce0 100644
--- a/src/video_output/control.h
+++ b/src/video_output/control.h
@@ -48,12 +48,10 @@ void vout_control_cmd_Clean(vout_control_cmd_t *);
 
 typedef struct {
     vlc_mutex_t lock;
-    vlc_cond_t  wait_request;
     vlc_cond_t  wait_available;
 
     /* */
     bool is_dead;
-    bool can_sleep;
     bool is_held;
     DECL_ARRAY(vout_control_cmd_t) cmd;
 } vout_control_t;
@@ -67,7 +65,6 @@ void vout_control_PushVoid(vout_control_t *, int type);
 void vout_control_PushBool(vout_control_t *, int type, bool boolean);
 void vout_control_PushString(vout_control_t *, int type, const char *string);
 void vout_control_PushMouse(vout_control_t *, int type, const vlc_mouse_t *);
-void vout_control_Wake(vout_control_t *);
 void vout_control_Hold(vout_control_t *);
 void vout_control_Release(vout_control_t *);
 void vout_control_Dead(vout_control_t *);
-- 
2.26.2