Fixed AFMT_AC3 and AFMT_S16_NE handling.

[vlc] / include / video_output.h

diff --git a/include/video_output.h b/include/video_output.h
index c6ae12e4312c30ba3dbda31a6e2b5494a0783705..0ffdad4c7319c83acc5c6fe6f909d086e3108654 100644 (file)
--- a/include/video_output.h
+++ b/include/video_output.h
@@ -5,7 +5,7 @@
  * thread, and destroy a previously opened video output thread.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_output.h,v 1.84 2002/10/17 16:03:18 sam Exp $
+ * $Id: video_output.h,v 1.92 2003/01/28 22:03:21 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -68,16 +68,17 @@ struct vout_thread_t
     vout_sys_t *        p_sys;                       /* system output method */
 
     /* Current display properties */
-    u16                 i_changes;             /* changes made to the thread */
+    uint16_t            i_changes;             /* changes made to the thread */
     float               f_gamma;                                    /* gamma */
     vlc_bool_t          b_grayscale;           /* color or grayscale display */
     vlc_bool_t          b_info;              /* print additional information */
     vlc_bool_t          b_interface;                     /* render interface */
     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 */
-    int                 i_window_width;                /* video window width */
-    int                 i_window_height;              /* video window height */
+    unsigned int        i_window_width;                /* video window width */
+    unsigned int        i_window_height;              /* video window height */
 
     /* Plugin used and shortcuts to access its capabilities */
     module_t *   p_module;
@@ -116,6 +117,7 @@ struct vout_thread_t
 
     /* Filter chain */
     char *psz_filter_chain;
+    vlc_bool_t b_filter_change;
 };
 
 #define I_OUTPUTPICTURES p_vout->output.i_pictures
@@ -141,24 +143,27 @@ struct vout_thread_t
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
-#define vout_CreateThread(a,b,c,d,e) __vout_CreateThread(VLC_OBJECT(a),b,c,d,e)
-VLC_EXPORT( vout_thread_t *, __vout_CreateThread,   ( vlc_object_t *, int, int, u32, int ) );
-VLC_EXPORT( void,              vout_DestroyThread,  ( vout_thread_t * ) );
+#define vout_Request(a,b,c,d,e,f) __vout_Request(VLC_OBJECT(a),b,c,d,e,f)
+VLC_EXPORT( vout_thread_t *, __vout_Request,      ( vlc_object_t *, vout_thread_t *, unsigned int, unsigned int, uint32_t, unsigned int ) );
+#define vout_Create(a,b,c,d,e) __vout_Create(VLC_OBJECT(a),b,c,d,e)
+VLC_EXPORT( vout_thread_t *, __vout_Create,       ( vlc_object_t *, unsigned int, unsigned int, uint32_t, unsigned int ) );
+VLC_EXPORT( void,            vout_Destroy,        ( vout_thread_t * ) );
+VLC_EXPORT( int, vout_VarCallback, ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ) );
 
-VLC_EXPORT( int,             vout_ChromaCmp,      ( u32, u32 ) );
+VLC_EXPORT( int,             vout_ChromaCmp,      ( uint32_t, uint32_t ) );
 
 VLC_EXPORT( picture_t *,     vout_CreatePicture,  ( vout_thread_t *, vlc_bool_t, vlc_bool_t, vlc_bool_t ) );
-VLC_EXPORT( void,            vout_AllocatePicture,( vout_thread_t *, picture_t *, int, int, u32 ) );
+VLC_EXPORT( void,            vout_AllocatePicture,( vout_thread_t *, picture_t *, int, int, uint32_t ) );
 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_LinkPicture,    ( vout_thread_t *, picture_t * ) );
 VLC_EXPORT( void,            vout_UnlinkPicture,  ( vout_thread_t *, picture_t * ) );
-VLC_EXPORT( void,            vout_PlacePicture,   ( vout_thread_t *, int, int, int *, int *, int *, int * ) );
+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( subpicture_t *,  vout_CreateSubPicture,   ( vout_thread_t *, int, int ) );
+VLC_EXPORT( subpicture_t *,  vout_CreateSubPicture,   ( vout_thread_t *, int ) );
 VLC_EXPORT( void,            vout_DestroySubPicture,  ( vout_thread_t *, subpicture_t * ) );
 VLC_EXPORT( void,            vout_DisplaySubPicture,  ( vout_thread_t *, subpicture_t * ) );