Fixed input_get_event_manager naming scheme.

diff --git a/include/vlc_input.h b/include/vlc_input.h
index fc1c4473643c21f75785f0e659bfb9001a87f453..912abdff13a31af57700b79b289c9dabe17319c1 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -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.
  *

diff --git a/src/control/media_player.c b/src/control/media_player.c
index b210ea3c38f1cbcf4bc184caac93f445727bdb2d..0845d7e7d9c9720177cb7040c8f623c2d4522fdd 100644 (file)
--- a/src/control/media_player.c
+++ b/src/control/media_player.c
@@ -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 );

diff --git a/src/input/input.c b/src/input/input.c
index 7293cde4b41ebb803f90ed3aa63df32a072692f2..f7057e6118b9404b6ef0dc9d7fc4e24d4434f9b7 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -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;
 }

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 967138bc47a3e9a6506689195a4a6b7d31cc84ca..adf6311a136dc2499ce126aa8c1becdfd6d711c7 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -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

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 2c2f57c6104bea27a8ea20fedb8d850ec3d282c7..b7eac0d57ab44aa6c83ae6c714282fa6339e41d6 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -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,