[vlc-commits] vout: inline ThreadControl()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Apr 14 22:01:24 2020 +0300| [8c2bd089f0e759e1f629b32ebf5756b714f37b58] | committer: Rémi Denis-Courmont

vout: inline ThreadControl()

Non-functional change.

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

 src/video_output/video_output.c | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 8fae1bd897..6a361e568d 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1667,24 +1667,6 @@ error:
     return VLC_EGENERIC;
 }
 
-static void ThreadControl(vout_thread_t *vout, vout_control_cmd_t cmd)
-{
-    switch(cmd.type) {
-    case VOUT_CONTROL_CHANGE_FILTERS:
-        ThreadChangeFilters(vout, cmd.string, NULL, false);
-        break;
-    case VOUT_CONTROL_CHANGE_INTERLACE:
-        ThreadChangeFilters(vout, NULL, &cmd.boolean, false);
-        break;
-    case VOUT_CONTROL_MOUSE_STATE:
-        ThreadProcessMouseState(vout, &cmd.mouse);
-        break;
-    default:
-        break;
-    }
-    vout_control_cmd_Clean(&cmd);
-}
-
 /*****************************************************************************
  * Thread: video output thread
  *****************************************************************************
@@ -1712,7 +1694,19 @@ noreturn static void *Thread(void *object)
         }
         while (!vout_control_Pop(&sys->control, &cmd, deadline)) {
             int canc = vlc_savecancel();
-            ThreadControl(vout, cmd);
+
+            switch(cmd.type) {
+                case VOUT_CONTROL_CHANGE_FILTERS:
+                    ThreadChangeFilters(vout, cmd.string, NULL, false);
+                    break;
+                case VOUT_CONTROL_CHANGE_INTERLACE:
+                    ThreadChangeFilters(vout, NULL, &cmd.boolean, false);
+                    break;
+                case VOUT_CONTROL_MOUSE_STATE:
+                    ThreadProcessMouseState(vout, &cmd.mouse);
+                    break;
+            }
+            vout_control_cmd_Clean(&cmd);
             vlc_restorecancel(canc);
         }