* src/input/*:

[vlc] / include / video_output.h

diff --git a/include/video_output.h b/include/video_output.h
index 52afb5b03f09332fc4ebbe8df6c4c341851a9c9e..a0972e24ea764c7c7500ffa9b8c47a1aa1298f71 100644 (file)
--- a/include/video_output.h
+++ b/include/video_output.h
@@ -2,7 +2,7 @@
  * video_output.h : video output thread
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_output.h,v 1.102 2003/11/19 00:06:06 sigmunau Exp $
+ * $Id$
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -11,7 +11,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -73,7 +73,7 @@ struct vout_thread_t
     vlc_mutex_t         change_lock;                 /**< thread change lock */
     vout_sys_t *        p_sys;                     /**< system output method */
     /**@}*/
-    
+
     /** \name Current display properties */
     /**@{*/
     uint16_t            i_changes;          /**< changes made to the thread.
@@ -90,7 +90,7 @@ struct vout_thread_t
     unsigned int        i_window_height;            /**< video window height */
     unsigned int        i_alignment;          /**< video alignment in window */
     /**@}*/
-    
+
     /** \name Plugin used and shortcuts to access its capabilities */
     /**@{*/
     module_t *   p_module;
@@ -122,6 +122,8 @@ struct vout_thread_t
     picture_t           p_picture[2*VOUT_MAX_PICTURES];        /**< pictures */
     subpicture_t        p_subpicture[VOUT_MAX_PICTURES];    /**< subpictures */
 
+    subpicture_t *      p_last_osd_message;
+
     /* Statistics */
     count_t          c_loops;
     count_t          c_pictures, c_late_pictures;
@@ -138,11 +140,11 @@ struct vout_thread_t
 
     /* text renderer data */
     text_renderer_sys_t * p_text_renderer_data;        /**< private data for
-                                                          the text renderer */
+                                                           the text renderer */
     module_t *            p_text_renderer_module;  /**< text renderer module */
     /** callback used when a new string needs to be shown on the vout */
-    int ( *pf_add_string ) ( vout_thread_t *, byte_t *, text_style_t *, int,  
-                            int, int, mtime_t, mtime_t ); 
+    subpicture_t * ( *pf_add_string ) ( vout_thread_t *, char *, text_style_t *, int,
+                             int, int, mtime_t, mtime_t );
 };
 
 #define I_OUTPUTPICTURES p_vout->output.i_pictures
@@ -156,13 +158,13 @@ struct vout_thread_t
  * @{
  */
 /** b_info changed */
-#define VOUT_INFO_CHANGE        0x0001                   
+#define VOUT_INFO_CHANGE        0x0001
 /** b_grayscale changed */
-#define VOUT_GRAYSCALE_CHANGE   0x0002              
+#define VOUT_GRAYSCALE_CHANGE   0x0002
 /** b_interface changed */
-#define VOUT_INTF_CHANGE        0x0004              
+#define VOUT_INTF_CHANGE        0x0004
 /** b_scale changed */
-#define VOUT_SCALE_CHANGE       0x0008                  
+#define VOUT_SCALE_CHANGE       0x0008
 /** gamma changed */
 #define VOUT_GAMMA_CHANGE       0x0010
 /** b_cursor changed */
@@ -175,6 +177,8 @@ struct vout_thread_t
 #define VOUT_DEPTH_CHANGE       0x0400
 /** change chroma tables */
 #define VOUT_CHROMA_CHANGE      0x0800
+/** change/recreate picture buffers */
+#define VOUT_PICTURE_BUFFERS_CHANGE 0x1000
 /**@}*/
 
 /* Alignment flags */
@@ -202,7 +206,7 @@ VLC_EXPORT( int,             vout_ChromaCmp,      ( uint32_t, uint32_t ) );
 VLC_EXPORT( picture_t *,     vout_CreatePicture,  ( vout_thread_t *, vlc_bool_t, vlc_bool_t, unsigned int ) );
 VLC_EXPORT( void,            vout_InitFormat,     ( video_frame_format_t *, uint32_t, int, int, int ) );
 VLC_EXPORT( void,            vout_InitPicture,    ( vlc_object_t *, picture_t *, uint32_t, int, int, int ) );
-VLC_EXPORT( void,            vout_AllocatePicture,( vout_thread_t *, picture_t *, uint32_t, int, int, int ) );
+VLC_EXPORT( void,            vout_AllocatePicture,( vlc_object_t *, picture_t *, uint32_t, int, int, int ) );
 VLC_EXPORT( void,            vout_DestroyPicture, ( vout_thread_t *, picture_t * ) );
 VLC_EXPORT( void,            vout_DisplayPicture, ( vout_thread_t *, picture_t * ) );
 VLC_EXPORT( void,            vout_DatePicture,    ( vout_thread_t *, picture_t *, mtime_t ) );
@@ -211,6 +215,9 @@ VLC_EXPORT( void,            vout_UnlinkPicture,  ( vout_thread_t *, picture_t *
 VLC_EXPORT( void,            vout_PlacePicture,   ( vout_thread_t *, unsigned int, unsigned int, unsigned int *, unsigned int *, unsigned int *, unsigned int * ) );
 picture_t *     vout_RenderPicture  ( vout_thread_t *, picture_t *,
                                                        subpicture_t * );
+VLC_EXPORT( void *, vout_RequestWindow, ( vout_thread_t *, int *, int *, unsigned int *, unsigned int * ) );
+VLC_EXPORT( void,   vout_ReleaseWindow, ( vout_thread_t *, void * ) );
+
 /**
  * \addtogroup subpicture
  * @{