Moved out text_style_* to src/misc/text_style.c

[vlc] / src / video_output / vout_internal.h

diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index 2489d285eb2ca43e26196e122cc5a912bfc1bc04..d6b8fe24a342800f9be8fcbbac769c15fff3de8e 100644 (file)
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -51,6 +51,11 @@ struct vout_thread_sys_t
     /* Video output configuration */
     config_chain_t *p_cfg;
 
+    /* */
+    video_format_t  fmt_render;      /* render format (from the decoder) */
+    video_format_t  fmt_in;            /* input (modified render) format */
+    video_format_t  fmt_out;     /* output format (for the video output) */
+
     /* Thread & synchronization */
     vlc_thread_t    thread;
     vlc_cond_t      change_wait;
@@ -130,8 +135,6 @@ struct vout_thread_sys_t
 
     uint16_t            i_changes;          /**< changes made to the thread.
                                                       \see \ref vout_changes */
-    unsigned            b_fullscreen:1;       /**< toogle fullscreen display */
-    unsigned            b_on_top:1; /**< stay always on top of other windows */
 };
 
 /** \defgroup vout_changes Flags for changes
@@ -139,20 +142,17 @@ struct vout_thread_sys_t
  * thread changed a variable
  * @{
  */
-/** b_autoscale changed */
-#define VOUT_SCALE_CHANGE       0x0008
-/** b_on_top changed */
-#define VOUT_ON_TOP_CHANGE      0x0010
-/** b_fullscreen changed */
-#define VOUT_FULLSCREEN_CHANGE  0x0040
-/** i_zoom changed */
-#define VOUT_ZOOM_CHANGE        0x0080
 /** cropping parameters changed */
 #define VOUT_CROP_CHANGE        0x1000
 /** aspect ratio changed */
 #define VOUT_ASPECT_CHANGE      0x2000
 /**@}*/
 
+/* TODO to move them to vlc_vout.h */
+void vout_ControlChangeFullscreen(vout_thread_t *, bool fullscreen);
+void vout_ControlChangeOnTop(vout_thread_t *, bool is_on_top);
+void vout_ControlChangeDisplayFilled(vout_thread_t *, bool is_filled);
+void vout_ControlChangeZoom(vout_thread_t *, int num, int den);
 
 /* */
 void vout_IntfInit( vout_thread_t * );
@@ -166,5 +166,13 @@ int  vout_ManageWrapper(vout_thread_t *);
 void vout_RenderWrapper(vout_thread_t *, picture_t *);
 void vout_DisplayWrapper(vout_thread_t *, picture_t *);
 
+/* */
+int spu_ProcessMouse(spu_t *, const vlc_mouse_t *, const video_format_t *);
+
+/* */
+int vout_ShowTextRelative( vout_thread_t *, int, char *, const text_style_t *, int, int, int, mtime_t );
+int vout_ShowTextAbsolute( vout_thread_t *, int, const char *, const text_style_t *, int, int, int, mtime_t, mtime_t );
+
+
 #endif