Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / video_output / control.h

diff --git a/src/video_output/control.h b/src/video_output/control.h
index a8010d0a32acaec89b3718105db2b42845e98a00..9510c22ce98aa97aaea41c1b8e78881e42e1b7a3 100644 (file)
--- a/src/video_output/control.h
+++ b/src/video_output/control.h
@@ -30,30 +30,21 @@
 
 /* */
 enum {
-#if 0
     VOUT_CONTROL_INIT,
-    VOUT_CONTROL_EXIT,
+    VOUT_CONTROL_CLEAN,
+    VOUT_CONTROL_REINIT,                /* cfg */
 
+#if 0
     /* */
     VOUT_CONTROL_START,
     VOUT_CONTROL_STOP,
-
-    /* Controls */
-
-    VOUT_CONTROL_SOURCE_ASPECT,
-    VOUT_CONTROL_SOURCE_CROP_BORDER,
-    VOUT_CONTROL_SOURCE_CROP_RATIO,
-    VOUT_CONTROL_SOURCE_CROP_WINDOW,
-
-    /* OSD */
-    VOUT_CONTROL_OSD_MESSAGE,
-    VOUT_CONTROL_OSD_TEXT,
-    VOUT_CONTROL_OSD_SLIDER,
-    VOUT_CONTROL_OSD_ICON,
-    VOUT_CONTROL_OSD_SUBPICTURE,
 #endif
+    VOUT_CONTROL_SUBPICTURE,            /* subpicture */
+    VOUT_CONTROL_FLUSH_SUBPICTURE,      /* integer */
     VOUT_CONTROL_OSD_TITLE,             /* string */
     VOUT_CONTROL_CHANGE_FILTERS,        /* string */
+    VOUT_CONTROL_CHANGE_SUB_FILTERS,    /* string */
+    VOUT_CONTROL_CHANGE_SUB_MARGIN,     /* integer */
 
     VOUT_CONTROL_PAUSE,
     VOUT_CONTROL_RESET,
@@ -64,6 +55,11 @@ enum {
     VOUT_CONTROL_ON_TOP,                /* bool */
     VOUT_CONTROL_DISPLAY_FILLED,        /* bool */
     VOUT_CONTROL_ZOOM,                  /* pair */
+
+    VOUT_CONTROL_ASPECT_RATIO,          /* pair */
+    VOUT_CONTROL_CROP_BORDER,           /* border */
+    VOUT_CONTROL_CROP_RATIO,            /* pair */
+    VOUT_CONTROL_CROP_WINDOW,           /* window */
 };
 
 typedef struct {
@@ -74,6 +70,7 @@ typedef struct {
         mtime_t time;
         mtime_t *time_ptr;
         char    *string;
+        int     integer;
         struct {
             int a;
             int b;
@@ -86,17 +83,6 @@ typedef struct {
             int channel;
             char *string;
         } message;
-#if 0
-        struct {
-            int channel;
-            char *string;
-            text_style_t *style;
-            int flags;
-            int hmargin;
-            int vmargin;
-            mtime_t start;
-            mtime_t stop;
-        } text;
         struct {
             unsigned left;
             unsigned top;
@@ -109,17 +95,8 @@ typedef struct {
             unsigned width;
             unsigned height;
         } window;
-        struct {
-            int   channel;
-            int   type;
-            float position;
-        } slider;
-        struct {
-            int channel;
-            int icon;
-        } icon;
+        const vout_configuration_t *cfg;
         subpicture_t *subpicture;
-#endif
     } u;
 } vout_control_cmd_t;
 
@@ -149,6 +126,7 @@ 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_PushInteger(vout_control_t *, int type, int integer);
 void vout_control_PushTime(vout_control_t *, int type, mtime_t time);
 void vout_control_PushMessage(vout_control_t *, int type, int channel, const char *string);
 void vout_control_PushPair(vout_control_t *, int type, int a, int b);