decoder: reduce lock scope and cosmetic

[vlc] / include / vlc_vout.h

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index ad08f3975f9d39d0e8356727b7544cefc8b71da7..15f321d1e71872767fd74cce3ab38c9954cda420 100644 (file)
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -1,26 +1,26 @@
 /*****************************************************************************
- * vlc_video.h: common video definitions
+ * vlc_vout.h: common video definitions
  *****************************************************************************
- * Copyright (C) 1999 - 2008 the VideoLAN team
+ * Copyright (C) 1999 - 2008 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
  *          Olivier Aubert <oaubert 47 videolan d07 org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef VLC_VOUT_H_
@@ -59,7 +59,7 @@ typedef struct {
 } vout_configuration_t;
 
 /**
- * Video ouput thread private structure
+ * Video output thread private structure
  */
 typedef struct vout_thread_sys_t vout_thread_sys_t;
 
@@ -103,7 +103,7 @@ struct vout_thread_t {
  * \param cfg the video configuration requested.
  * \return a vout
  */
-VLC_EXPORT( vout_thread_t *, vout_Request, ( vlc_object_t *object, const vout_configuration_t *cfg ) );
+VLC_API vout_thread_t * vout_Request( vlc_object_t *object, const vout_configuration_t *cfg );
 #define vout_Request(a,b) vout_Request(VLC_OBJECT(a),b)
 
 /**
@@ -114,7 +114,7 @@ VLC_EXPORT( vout_thread_t *, vout_Request, ( vlc_object_t *object, const vout_co
  *
  * \param p_vout the vout to close
  */
-VLC_EXPORT( void,            vout_Close,        ( vout_thread_t *p_vout ) );
+VLC_API void vout_Close( vout_thread_t *p_vout );
 
 /**
  * This function will close a vout created by vout_Create
@@ -140,24 +140,24 @@ static inline void vout_CloseAndRelease( vout_thread_t *p_vout )
  * available.
  *
  */
-VLC_EXPORT( int, vout_GetSnapshot, ( vout_thread_t *p_vout,
-                                     block_t **pp_image, picture_t **pp_picture,
-                                     video_format_t *p_fmt,
-                                     const char *psz_format, mtime_t i_timeout ) );
+VLC_API int vout_GetSnapshot( vout_thread_t *p_vout,
+                              block_t **pp_image, picture_t **pp_picture,
+                              video_format_t *p_fmt,
+                              const char *psz_format, mtime_t i_timeout );
 
-/* */
-VLC_EXPORT( picture_t *,     vout_GetPicture,     ( vout_thread_t * ) );
-VLC_EXPORT( void,            vout_PutPicture,     ( vout_thread_t *, picture_t * ) );
+VLC_API void vout_ChangeAspectRatio( vout_thread_t *p_vout,
+                                     unsigned int i_num, unsigned int i_den );
 
-VLC_EXPORT( void,            vout_HoldPicture,    ( vout_thread_t *, picture_t * ) );
-VLC_EXPORT( void,            vout_ReleasePicture, ( vout_thread_t *, picture_t * ) );
+/* */
+VLC_API picture_t * vout_GetPicture( vout_thread_t * );
+VLC_API void vout_PutPicture( vout_thread_t *, picture_t * );
 
 /* */
-VLC_EXPORT( void, vout_PutSubpicture,             ( vout_thread_t *, subpicture_t * ) );
-VLC_EXPORT( int,  vout_RegisterSubpictureChannel, ( vout_thread_t * ) );
-VLC_EXPORT( void, vout_FlushSubpictureChannel,    ( vout_thread_t *, int ) );
+VLC_API void vout_PutSubpicture( vout_thread_t *, subpicture_t * );
+VLC_API int vout_RegisterSubpictureChannel( vout_thread_t * );
+VLC_API void vout_FlushSubpictureChannel( vout_thread_t *, int );
 
-VLC_EXPORT( void, vout_EnableFilter, ( vout_thread_t *, const char *,bool , bool  ) );
+VLC_API void vout_EnableFilter( vout_thread_t *, const char *,bool , bool  );
 
 /**@}*/