Commit 132855eb authored by Laurent Aimar's avatar Laurent Aimar

Fixed input_get_event_manager naming scheme.

parent e03ea0d7
......@@ -667,14 +667,19 @@ static inline int input_AddSubtitle( input_thread_t *p_input, const char *psz_ur
return input_Control( p_input, INPUT_ADD_SUBTITLE, psz_url, b_check_extension );
}
/**
* It will return the input event manager.
*
* You are advised to use "intf-event" instead if you want completness.
*/
VLC_EXPORT( vlc_event_manager_t *, input_GetEventManager, ( input_thread_t * ) );
/* */
typedef struct input_clock_t input_clock_t;
VLC_EXPORT( decoder_t *, input_DecoderNew, ( input_thread_t *, es_format_t *, input_clock_t *, sout_instance_t * ) );
VLC_EXPORT( void, input_DecoderDelete, ( decoder_t * ) );
VLC_EXPORT( void, input_DecoderDecode,( decoder_t *, block_t * ) );
VLC_EXPORT( vlc_event_manager_t *, input_get_event_manager, ( input_thread_t * ) );
/**
* This function allows to split a MRL into access, demux and path part.
*
......
......@@ -80,7 +80,7 @@ static void release_input_thread( libvlc_media_player_t *p_mi )
/* No one is tracking this input_thread appart us. Destroy it */
if( p_mi->b_own_its_input_thread )
{
vlc_event_manager_t * p_em = input_get_event_manager( p_input_thread );
vlc_event_manager_t * p_em = input_GetEventManager( p_input_thread );
vlc_event_detach( p_em, vlc_InputStateChanged, input_state_changed, p_mi );
var_DelCallback( p_input_thread, "can-seek", input_seekable_changed, p_mi );
var_DelCallback( p_input_thread, "can-pause", input_pausable_changed, p_mi );
......@@ -573,7 +573,7 @@ void libvlc_media_player_play( libvlc_media_player_t *p_mi,
var_Set( p_input_thread, "drawable", val );
}
vlc_event_manager_t * p_em = input_get_event_manager( p_input_thread );
vlc_event_manager_t * p_em = input_GetEventManager( p_input_thread );
vlc_event_attach( p_em, vlc_InputStateChanged, input_state_changed, p_mi );
var_AddCallback( p_input_thread, "can-seek", input_seekable_changed, p_mi );
......
......@@ -3199,9 +3199,9 @@ void input_UpdateStatistic( input_thread_t *p_input,
vlc_mutex_unlock( &p_input->p->counters.counters_lock);
}
/*****************************************************************************
* input_get_event_manager
* input_GetEventManager
*****************************************************************************/
vlc_event_manager_t *input_get_event_manager( input_thread_t *p_input )
vlc_event_manager_t *input_GetEventManager( input_thread_t *p_input )
{
return &p_input->p->event_manager;
}
......
......@@ -159,7 +159,7 @@ __input_CreateThread
input_DecoderDecode
input_DecoderDelete
input_DecoderNew
input_get_event_manager
input_GetEventManager
input_GetItem
input_item_AddInfo
input_item_AddOpt
......
......@@ -250,7 +250,7 @@ void playlist_release_current_input( playlist_t * p_playlist )
if( !pl_priv(p_playlist)->p_input ) return;
input_thread_t * p_input = pl_priv(p_playlist)->p_input;
vlc_event_manager_t * p_em = input_get_event_manager( p_input );
vlc_event_manager_t * p_em = input_GetEventManager( p_input );
vlc_event_detach( p_em, vlc_InputStateChanged,
input_state_changed, p_playlist );
......@@ -277,7 +277,7 @@ void playlist_set_current_input(
{
vlc_object_hold( p_input );
pl_priv(p_playlist)->p_input = p_input;
vlc_event_manager_t * p_em = input_get_event_manager( p_input );
vlc_event_manager_t * p_em = input_GetEventManager( p_input );
vlc_event_attach( p_em, vlc_InputStateChanged,
input_state_changed, p_playlist );
vlc_event_attach( p_em, vlc_InputSelectedStreamChanged,
......
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