Used vout_control_Push for vout_PutSubpicture.

[vlc] / src / video_output / control.h

diff --git a/src/video_output/control.h b/src/video_output/control.h
index 59202e1a3b94fe4595d1d7f586b44ff881fe57e3..c9c1cf0890f1a8d280f977802b5feb193a3181f6 100644 (file)
--- a/src/video_output/control.h
+++ b/src/video_output/control.h
@@ -32,15 +32,17 @@
 enum {
     VOUT_CONTROL_INIT,
     VOUT_CONTROL_CLEAN,
-    VOUT_CONTROL_REINIT,                /* reinit */
+    VOUT_CONTROL_REINIT,                /* cfg */
 
 #if 0
     /* */
     VOUT_CONTROL_START,
     VOUT_CONTROL_STOP,
 #endif
+    VOUT_CONTROL_SUBPICTURE,            /* subpicture */
     VOUT_CONTROL_OSD_TITLE,             /* string */
     VOUT_CONTROL_CHANGE_FILTERS,        /* string */
+    VOUT_CONTROL_CHANGE_SUB_FILTERS,    /* string */
 
     VOUT_CONTROL_PAUSE,
     VOUT_CONTROL_RESET,
@@ -90,9 +92,8 @@ typedef struct {
             unsigned width;
             unsigned height;
         } window;
-        struct {
-            const video_format_t *fmt;
-        } reinit;
+        const vout_configuration_t *cfg;
+        subpicture_t *subpicture;
     } u;
 } vout_control_cmd_t;