mirror of
https://code.videolan.org/videolan/vlc
synced 2024-10-03 01:31:53 +02:00
vout: remove leading underscores
This commit is contained in:
parent
0ec6ee7cbd
commit
0418028281
@ -80,10 +80,9 @@ struct picture_heap_t
|
||||
* \param i_height the wanted height for the picture.
|
||||
* \param i_aspect the wanted aspect ratio for the picture.
|
||||
*/
|
||||
VLC_EXPORT( int, vout_AllocatePicture,( vlc_object_t *p_this, picture_t *p_pic, uint32_t i_chroma, int i_width, int i_height, int i_sar_num, int i_sar_den ) );
|
||||
#define vout_AllocatePicture(a,b,c,d,e,f,g) \
|
||||
__vout_AllocatePicture(VLC_OBJECT(a),b,c,d,e,f,g)
|
||||
VLC_EXPORT( int, __vout_AllocatePicture,( vlc_object_t *p_this, picture_t *p_pic, uint32_t i_chroma, int i_width, int i_height, int i_sar_num, int i_sar_den ) );
|
||||
|
||||
vout_AllocatePicture(VLC_OBJECT(a),b,c,d,e,f,g)
|
||||
|
||||
/**
|
||||
* \defgroup video_output Video Output
|
||||
@ -244,8 +243,8 @@ struct vout_thread_t
|
||||
* \return a vout if p_fmt is non NULL and the request is successfull, NULL
|
||||
* otherwise
|
||||
*/
|
||||
#define vout_Request(a,b,c) __vout_Request(VLC_OBJECT(a),b,c)
|
||||
VLC_EXPORT( vout_thread_t *, __vout_Request, ( vlc_object_t *p_this, vout_thread_t *p_vout, video_format_t *p_fmt ) );
|
||||
VLC_EXPORT( vout_thread_t *, vout_Request, ( vlc_object_t *p_this, vout_thread_t *p_vout, video_format_t *p_fmt ) );
|
||||
#define vout_Request(a,b,c) vout_Request(VLC_OBJECT(a),b,c)
|
||||
|
||||
/**
|
||||
* This function will create a suitable vout for a given p_fmt. It will never
|
||||
@ -256,8 +255,8 @@ VLC_EXPORT( vout_thread_t *, __vout_Request, ( vlc_object_t *p_this, vout_thr
|
||||
* \param p_fmt the video format requested
|
||||
* \return a vout if the request is successfull, NULL otherwise
|
||||
*/
|
||||
#define vout_Create(a,b) __vout_Create(VLC_OBJECT(a),b)
|
||||
VLC_EXPORT( vout_thread_t *, __vout_Create, ( vlc_object_t *p_this, video_format_t *p_fmt ) );
|
||||
VLC_EXPORT( vout_thread_t *, vout_Create, ( vlc_object_t *p_this, video_format_t *p_fmt ) );
|
||||
#define vout_Create(a,b) vout_Create(VLC_OBJECT(a),b)
|
||||
|
||||
/**
|
||||
* This function will close a vout created by vout_Create or vout_Request.
|
||||
|
@ -595,10 +595,10 @@ vlm_MessageDelete
|
||||
vlm_MessageNew
|
||||
vlm_MessageSimpleNew
|
||||
vlm_New
|
||||
__vout_AllocatePicture
|
||||
vout_AllocatePicture
|
||||
vout_ChromaCmp
|
||||
vout_Close
|
||||
__vout_Create
|
||||
vout_Create
|
||||
vout_CreatePicture
|
||||
vout_DestroyPicture
|
||||
vout_DisplayPicture
|
||||
@ -611,7 +611,7 @@ vout_OSDMessage
|
||||
vout_OSDEpg
|
||||
vout_OSDSlider
|
||||
vout_PlacePicture
|
||||
__vout_Request
|
||||
vout_Request
|
||||
vout_ShowTextAbsolute
|
||||
vout_ShowTextRelative
|
||||
vout_UnlinkPicture
|
||||
|
@ -145,14 +145,15 @@ static int video_filter_buffer_allocation_init( filter_t *p_filter, void *p_data
|
||||
return VLC_SUCCESS;
|
||||
}
|
||||
|
||||
#undef vout_Request
|
||||
/*****************************************************************************
|
||||
* vout_Request: find a video output thread, create one, or destroy one.
|
||||
*****************************************************************************
|
||||
* This function looks for a video output thread matching the current
|
||||
* properties. If not found, it spawns a new one.
|
||||
*****************************************************************************/
|
||||
vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
|
||||
video_format_t *p_fmt )
|
||||
vout_thread_t *vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
|
||||
video_format_t *p_fmt )
|
||||
{
|
||||
if( !p_fmt )
|
||||
{
|
||||
@ -276,13 +277,14 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
|
||||
return p_vout;
|
||||
}
|
||||
|
||||
#undef vout_Create
|
||||
/*****************************************************************************
|
||||
* vout_Create: creates a new video output thread
|
||||
*****************************************************************************
|
||||
* This function creates a new video output thread, and returns a pointer
|
||||
* to its description. On error, it returns NULL.
|
||||
*****************************************************************************/
|
||||
vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
|
||||
vout_thread_t * vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
|
||||
{
|
||||
vout_thread_t * p_vout; /* thread descriptor */
|
||||
int i_index; /* loop variable */
|
||||
|
@ -546,6 +546,7 @@ void vout_PlacePicture( const vout_thread_t *p_vout,
|
||||
}
|
||||
}
|
||||
|
||||
#undef vout_AllocatePicture
|
||||
/**
|
||||
* Allocate a new picture in the heap.
|
||||
*
|
||||
@ -553,10 +554,10 @@ void vout_PlacePicture( const vout_thread_t *p_vout,
|
||||
* used exactly like a video buffer. The video output thread then manages
|
||||
* how it gets displayed.
|
||||
*/
|
||||
int __vout_AllocatePicture( vlc_object_t *p_this, picture_t *p_pic,
|
||||
vlc_fourcc_t i_chroma,
|
||||
int i_width, int i_height,
|
||||
int i_sar_num, int i_sar_den )
|
||||
int vout_AllocatePicture( vlc_object_t *p_this, picture_t *p_pic,
|
||||
vlc_fourcc_t i_chroma,
|
||||
int i_width, int i_height,
|
||||
int i_sar_num, int i_sar_den )
|
||||
{
|
||||
VLC_UNUSED(p_this);
|
||||
int i_index, i_width_aligned, i_height_aligned;
|
||||
@ -979,9 +980,9 @@ picture_t *picture_NewFromResource( const video_format_t *p_fmt, const picture_r
|
||||
}
|
||||
else
|
||||
{
|
||||
if( __vout_AllocatePicture( NULL, p_picture,
|
||||
fmt.i_chroma, fmt.i_width, fmt.i_height,
|
||||
fmt.i_sar_num, fmt.i_sar_den ) )
|
||||
if( vout_AllocatePicture( (vlc_object_t *)NULL, p_picture,
|
||||
fmt.i_chroma, fmt.i_width, fmt.i_height,
|
||||
fmt.i_sar_num, fmt.i_sar_den ) )
|
||||
{
|
||||
free( p_picture );
|
||||
return NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user