[vlc-commits] video_output: remove unused VOUT_CONTROL_CHANGE_FILTERS and strings controls

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Sep 15 06:20:19 2020 +0200| [9f1f870dad48484a8f946edd8c51f981286ce1c4] | committer: Steve Lhomme

video_output: remove unused VOUT_CONTROL_CHANGE_FILTERS and strings controls

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

 src/video_output/control.c      | 26 --------------------------
 src/video_output/control.h      |  4 ----
 src/video_output/video_output.c |  4 ----
 3 files changed, 34 deletions(-)

diff --git a/src/video_output/control.c b/src/video_output/control.c
index b4a9a71165..af1a714dc4 100644
--- a/src/video_output/control.c
+++ b/src/video_output/control.c
@@ -36,17 +36,6 @@ void vout_control_cmd_Init(vout_control_cmd_t *cmd, int type)
     cmd->type = type;
 }
 
-void vout_control_cmd_Clean(vout_control_cmd_t *cmd)
-{
-    switch (cmd->type) {
-    case VOUT_CONTROL_CHANGE_FILTERS:
-        free(cmd->string);
-        break;
-    default:
-        break;
-    }
-}
-
 /* */
 void vout_control_Init(vout_control_t *ctrl)
 {
@@ -64,10 +53,6 @@ void vout_control_Init(vout_control_t *ctrl)
 void vout_control_Clean(vout_control_t *ctrl)
 {
     /* */
-    for (int i = 0; i < ctrl->cmd.i_size; i++) {
-        vout_control_cmd_t cmd = ARRAY_VAL(ctrl->cmd, i);
-        vout_control_cmd_Clean(&cmd);
-    }
     ARRAY_RESET(ctrl->cmd);
 }
 
@@ -84,8 +69,6 @@ void vout_control_Push(vout_control_t *ctrl, vout_control_cmd_t *cmd)
     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);
 }
@@ -114,15 +97,6 @@ void vout_control_PushBool(vout_control_t *ctrl, int type, bool boolean)
     vout_control_Push(ctrl, &cmd);
 }
 
-void vout_control_PushString(vout_control_t *ctrl, int type, const char *string)
-{
-    vout_control_cmd_t cmd;
-
-    vout_control_cmd_Init(&cmd, type);
-    cmd.string = string ? strdup(string) : NULL;
-    vout_control_Push(ctrl, &cmd);
-}
-
 void vout_control_Hold(vout_control_t *ctrl)
 {
     vlc_mutex_lock(&ctrl->lock);
diff --git a/src/video_output/control.h b/src/video_output/control.h
index eee86c4ca9..ed4613d6c1 100644
--- a/src/video_output/control.h
+++ b/src/video_output/control.h
@@ -28,7 +28,6 @@
 /* */
 enum {
     VOUT_CONTROL_TERMINATE,
-    VOUT_CONTROL_CHANGE_FILTERS,        /* string */
     VOUT_CONTROL_CHANGE_INTERLACE,      /* boolean */
 
     VOUT_CONTROL_MOUSE_STATE,           /* vlc_mouse_t */
@@ -39,13 +38,11 @@ typedef struct {
 
     union {
         bool    boolean;
-        char    *string;
         vlc_mouse_t mouse;
     };
 } vout_control_cmd_t;
 
 void vout_control_cmd_Init(vout_control_cmd_t *, int type);
-void vout_control_cmd_Clean(vout_control_cmd_t *);
 
 typedef struct {
     vlc_mutex_t lock;
@@ -70,7 +67,6 @@ void vout_control_WaitEmpty(vout_control_t *);
 void vout_control_Push(vout_control_t *, vout_control_cmd_t *);
 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_Wake(vout_control_t *);
 void vout_control_Hold(vout_control_t *);
 void vout_control_Release(vout_control_t *);
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 343f01dd21..5a906f6250 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1907,9 +1907,6 @@ static void *Thread(void *object)
             switch(cmd.type) {
                 case VOUT_CONTROL_TERMINATE:
                     return NULL; /* no need to clean &cmd */
-                case VOUT_CONTROL_CHANGE_FILTERS:
-                    ThreadChangeFilters(vout, cmd.string, NULL, false);
-                    break;
                 case VOUT_CONTROL_CHANGE_INTERLACE:
                     ThreadChangeFilters(vout, NULL, &cmd.boolean, false);
                     break;
@@ -1917,7 +1914,6 @@ static void *Thread(void *object)
                     ThreadProcessMouseState(vout, &cmd.mouse);
                     break;
             }
-            vout_control_cmd_Clean(&cmd);
         }
 
         deadline = VLC_TICK_INVALID;