* video_output.h : video output thread
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_output.h,v 1.99 2003/10/04 15:51:22 sigmunau Exp $
+ * $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
* 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
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.
vlc_bool_t b_scale; /**< allow picture scaling */
vlc_bool_t b_fullscreen; /**< toogle fullscreen display */
vlc_bool_t b_override_aspect; /**< aspect ratio overriden */
- mtime_t render_time; /**< last picture render time */
+ uint32_t render_time; /**< last picture render time */
unsigned int i_window_width; /**< video window width */
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;
int ( *pf_manage ) ( vout_thread_t * );
void ( *pf_render ) ( vout_thread_t *, picture_t * );
void ( *pf_display ) ( vout_thread_t *, picture_t * );
+ int ( *pf_control ) ( vout_thread_t *, int, va_list );
/**@}*/
/** \name Statistics
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;
/* 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 *, char *, 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
* @{
*/
/** 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 */
#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 */
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_InitPicture, ( vlc_object_t *, picture_t *, int, int, uint32_t ) );
-VLC_EXPORT( void, vout_AllocatePicture,( vout_thread_t *, picture_t *, int, int, uint32_t ) );
+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,( 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 ) );
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 * ) );
+VLC_EXPORT( int, vout_ControlWindow, ( vout_thread_t *, void *, int, va_list ) );
+
+static inline int vout_vaControl( vout_thread_t *p_vout, int i_query,
+ va_list args )
+{
+ if( p_vout->pf_control )
+ return p_vout->pf_control( p_vout, i_query, args );
+ else
+ return VLC_EGENERIC;
+}
+
+static inline int vout_Control( vout_thread_t *p_vout, int i_query, ... )
+{
+ va_list args;
+ int i_result;
+
+ va_start( args, i_query );
+ i_result = vout_vaControl( p_vout, i_query, args );
+ va_end( args );
+ return i_result;
+}
+
+enum output_query_e
+{
+ VOUT_SET_ZOOM, /* arg1= double res= */
+ VOUT_SET_STAY_ON_TOP, /* arg1= vlc_bool_t res= */
+ VOUT_REPARENT,
+ VOUT_CLOSE
+};
+
/**
* \addtogroup subpicture
* @{
projects / vlc / blobdiff