Commit 998ebb85 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

input: remove leading underscores

parent a87edce4
......@@ -23,8 +23,8 @@
*****************************************************************************/
/* __ is need because conflict with <vlc/input.h> */
#ifndef VLC__INPUT_H
#define VLC__INPUT_H 1
#ifndef VLC_INPUT_H
#define VLC_INPUT_H 1
/**
* \file
......@@ -526,18 +526,18 @@ enum input_query_e
* Prototypes
*****************************************************************************/
#define input_Create(a,b,c,d) __input_Create(VLC_OBJECT(a),b,c,d)
VLC_EXPORT( input_thread_t *, __input_Create, ( vlc_object_t *p_parent, input_item_t *, const char *psz_log, input_resource_t * ) );
VLC_EXPORT( input_thread_t *, input_Create, ( vlc_object_t *p_parent, input_item_t *, const char *psz_log, input_resource_t * ) );
#define input_Create(a,b,c,d) input_Create(VLC_OBJECT(a),b,c,d)
#define input_CreateAndStart(a,b,c) __input_CreateAndStart(VLC_OBJECT(a),b,c)
VLC_EXPORT( input_thread_t *, __input_CreateAndStart, ( vlc_object_t *p_parent, input_item_t *, const char *psz_log ) );
VLC_EXPORT( input_thread_t *, input_CreateAndStart, ( vlc_object_t *p_parent, input_item_t *, const char *psz_log ) );
#define input_CreateAndStart(a,b,c) input_CreateAndStart(VLC_OBJECT(a),b,c)
VLC_EXPORT( int, input_Start, ( input_thread_t * ) );
VLC_EXPORT( void, input_Stop, ( input_thread_t *, bool b_abort ) );
#define input_Read(a,b) __input_Read(VLC_OBJECT(a),b)
VLC_EXPORT( int, __input_Read, ( vlc_object_t *, input_item_t * ) );
VLC_EXPORT( int, input_Read, ( vlc_object_t *, input_item_t * ) );
#define input_Read(a,b) input_Read(VLC_OBJECT(a),b)
VLC_EXPORT( int, input_vaControl,( input_thread_t *, int i_query, va_list ) );
......
......@@ -22,8 +22,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef VLC__INPUT_ITEM_H
#define VLC__INPUT_ITEM_H 1
#ifndef VLC_INPUT_ITEM_H
#define VLC_INPUT_ITEM_H 1
/**
* \file
......@@ -254,8 +254,8 @@ VLC_EXPORT( input_item_t *, input_item_NewWithType, ( vlc_object_t *, const char
*
* Provided for convenience.
*/
#define input_item_NewExt(a,b,c,d,e,f,g) __input_item_NewExt( VLC_OBJECT(a),b,c,d,e,f,g)
VLC_EXPORT( input_item_t *, __input_item_NewExt, (vlc_object_t *, const char *psz_uri, const char *psz_name, int i_options, const char *const *ppsz_options, unsigned i_option_flags, mtime_t i_duration ) );
VLC_EXPORT( input_item_t *, input_item_NewExt, (vlc_object_t *, const char *psz_uri, const char *psz_name, int i_options, const char *const *ppsz_options, unsigned i_option_flags, mtime_t i_duration ) );
#define input_item_NewExt(a,b,c,d,e,f,g) input_item_NewExt( VLC_OBJECT(a),b,c,d,e,f,g)
/**
* This function creates a new input_item_t with the provided informations.
......
......@@ -112,6 +112,7 @@ static void input_ChangeState( input_thread_t *p_input, int i_state ); /* TODO f
/* Do not let a pts_delay from access/demux go beyong 60s */
#define INPUT_PTS_DELAY_MAX INT64_C(60000000)
#undef input_Create
/**
* Create a new input_thread_t.
*
......@@ -124,15 +125,14 @@ static void input_ChangeState( input_thread_t *p_input, int i_state ); /* TODO f
* \param p_resource an optional input ressource
* \return a pointer to the spawned input thread
*/
input_thread_t *__input_Create( vlc_object_t *p_parent,
input_item_t *p_item,
const char *psz_log, input_resource_t *p_resource )
input_thread_t *input_Create( vlc_object_t *p_parent,
input_item_t *p_item,
const char *psz_log, input_resource_t *p_resource )
{
return Create( p_parent, p_item, psz_log, false, p_resource );
}
#undef input_CreateAndStart
/**
* Create a new input_thread_t and start it.
*
......@@ -140,10 +140,10 @@ input_thread_t *__input_Create( vlc_object_t *p_parent,
*
* \see input_Create
*/
input_thread_t *__input_CreateAndStart( vlc_object_t *p_parent,
input_item_t *p_item, const char *psz_log )
input_thread_t *input_CreateAndStart( vlc_object_t *p_parent,
input_item_t *p_item, const char *psz_log )
{
input_thread_t *p_input = __input_Create( p_parent, p_item, psz_log, NULL );
input_thread_t *p_input = input_Create( p_parent, p_item, psz_log, NULL );
if( input_Start( p_input ) )
{
......@@ -153,6 +153,7 @@ input_thread_t *__input_CreateAndStart( vlc_object_t *p_parent,
return p_input;
}
#undef input_Read
/**
* Initialize an input thread and run it until it stops by itself.
*
......@@ -160,7 +161,7 @@ input_thread_t *__input_CreateAndStart( vlc_object_t *p_parent,
* \param p_item an input item
* \return an error code, VLC_SUCCESS on success
*/
int __input_Read( vlc_object_t *p_parent, input_item_t *p_item )
int input_Read( vlc_object_t *p_parent, input_item_t *p_item )
{
input_thread_t *p_input = Create( p_parent, p_item, NULL, false, NULL );
if( !p_input )
......
......@@ -812,13 +812,13 @@ void input_item_SetEpgOffline( input_item_t *p_item )
vlc_event_send( &p_item->event_manager, &event );
}
input_item_t *__input_item_NewExt( vlc_object_t *p_obj, const char *psz_uri,
const char *psz_name,
int i_options,
const char *const *ppsz_options,
unsigned i_option_flags,
mtime_t i_duration )
#undef input_item_NewExt
input_item_t *input_item_NewExt( vlc_object_t *p_obj, const char *psz_uri,
const char *psz_name,
int i_options,
const char *const *ppsz_options,
unsigned i_option_flags,
mtime_t i_duration )
{
return input_item_NewWithType( p_obj, psz_uri, psz_name,
i_options, ppsz_options, i_option_flags,
......
......@@ -178,8 +178,8 @@ image_Mime2Fourcc
image_Type2Fourcc
InitMD5
input_Control
__input_Create
__input_CreateAndStart
input_Create
input_CreateAndStart
input_CreateFilename
input_DecoderDecode
input_DecoderDelete
......@@ -201,7 +201,7 @@ input_item_IsArtFetched
input_item_IsPreparsed
input_item_MetaMatch
input_item_MergeInfos
__input_item_NewExt
input_item_NewExt
input_item_NewWithType
input_item_node_AppendItem
input_item_node_AppendNode
......@@ -215,7 +215,7 @@ input_item_SetMeta
input_item_SetName
input_item_SetURI
input_item_WriteMeta
__input_Read
input_Read
input_resource_Delete
input_SplitMRL
input_Start
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment