Qt4 - Open Capture Panel and file Panel: Don't build by hand the ComboChoices...

[vlc] / include / vlc_vout.h

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index 23ea5e7ccab28b319becad1c9005d21582eb5694..4779b0a429d18aa437edc507371266e46f185c58 100644 (file)
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -213,6 +213,7 @@ struct subpicture_region_t
     int             i_align;                  /**< alignment within a region */
 
     char            *psz_text;       /**< text string comprising this region */
+    char            *psz_html;       /**< HTML version of subtitle (NULL = use psz_text) */
     text_style_t    *p_style;  /* a description of the text style formatting */
 
     subpicture_region_t *p_next;                /**< next region in the list */
@@ -398,6 +399,7 @@ struct vout_thread_t
     vlc_mutex_t         picture_lock;                 /**< picture heap lock */
     vlc_mutex_t         subpicture_lock;           /**< subpicture heap lock */
     vlc_mutex_t         change_lock;                 /**< thread change lock */
+    vlc_mutex_t         vfilter_lock;         /**< video filter2 change lock */
     vout_sys_t *        p_sys;                     /**< system output method */
     /**@}*/
 
@@ -491,6 +493,9 @@ struct vout_thread_t
 
     /* Misc */
     vlc_bool_t       b_snapshot;     /**< take one snapshot on the next loop */
+
+    /* Video output configuration */
+    config_chain_t *p_cfg;
 };
 
 #define I_OUTPUTPICTURES p_vout->output.i_pictures
@@ -602,7 +607,8 @@ enum output_query_e
     VOUT_SNAPSHOT,
     VOUT_CLOSE,
     VOUT_SET_FOCUS,         /* arg1= vlc_bool_t       res=    */
-    VOUT_SET_VIEWPORT       /* arg1= view rect, arg2=clip rect, res= */
+    VOUT_SET_VIEWPORT,      /* arg1= view rect, arg2=clip rect, res= */
+    VOUT_REDRAW_RECT,       /* arg1= area rect, res= */
 };
 
 typedef struct snapshot_t {