libvlc events related functions renamed

bindings/java/src/callback-jni.cc

@@ -56,7 +56,7 @@ JNIEXPORT void JNICALL Java_org_videolan_jvlc_Audio__1install_1callback( JNIEnv
 	wakeupListenersMethod = env->GetStaticMethodID(audioClass, "wakeupListeners", "()V");
     }
 
-    libvlc_callback_register_for_event( ( libvlc_instance_t* ) instance,
+    libvlc_event_add_callback( ( libvlc_instance_t* ) instance,
 			       VOLUME_CHANGED,
 			       volumeChangedCallback,
 			       NULL,

include/vlc/libvlc.h

@@ -807,7 +807,7 @@ VLC_PUBLIC_API libvlc_log_message_t *libvlc_log_iterator_next( libvlc_log_iterat
  * \param user_data user provided data to carry with the event
  * \param p_e an initialized exception pointer
  */
-VLC_PUBLIC_API void libvlc_callback_register_for_event( libvlc_instance_t *p_instance,
+VLC_PUBLIC_API void libvlc_event_add_callback( libvlc_instance_t *p_instance,
                                                libvlc_event_type_t i_event_type,
                                                libvlc_callback_t f_callback,
                                                void *user_data,
@@ -820,7 +820,7 @@ VLC_PUBLIC_API void libvlc_callback_register_for_event( libvlc_instance_t *p_ins
  * \param f_callback the function to call when i_event_type occurs
  * \param p_e an initialized exception pointer
  */
-VLC_PUBLIC_API void libvlc_callback_unregister_for_event( libvlc_instance_t *p_instance,
+VLC_PUBLIC_API void libvlc_event_remove_callback( libvlc_instance_t *p_instance,
                                                   libvlc_event_type_t i_event_type,
                                                   libvlc_callback_t f_callback,
                                                   void *p_user_data,

src/control/event.c

 /*****************************************************************************
- * libvlc_callback.c: New libvlc callback control API
+ * event.c: New libvlc event control API
  *****************************************************************************
  * Copyright (C) 2007 the VideoLAN team
  * $Id $
@@ -24,7 +24,12 @@
 #include "libvlc_internal.h"
 #include <vlc/libvlc.h>
 
-static int handle_callback( vlc_object_t *p_this, char const *psz_cmd,
+
+/*
+ * Private functions
+ */
+
+static int handle_event( vlc_object_t *p_this, char const *psz_cmd,
                          vlc_value_t oldval, vlc_value_t newval,
                          void *p_data )
 {
@@ -50,7 +55,26 @@ static int handle_callback( vlc_object_t *p_this, char const *psz_cmd,
     return VLC_SUCCESS;
 }
 
-void libvlc_callback_register_for_event( libvlc_instance_t *p_instance,
+static inline void add_callback_entry( struct libvlc_callback_entry_t *entry,
+                                       struct libvlc_callback_entry_list_t **list )
+{
+    struct libvlc_callback_entry_list_t *new_listitem;
+    new_listitem = malloc( sizeof( struct libvlc_callback_entry_list_t ) );
+    new_listitem->elmt = entry;
+    new_listitem->next = *list;
+    new_listitem->prev = NULL;
+
+    if(*list)
+        (*list)->prev = new_listitem;
+
+    *list = new_listitem;
+}
+
+/*
+ * Public libvlc functions
+ */
+
+void libvlc_event_add_callback( libvlc_instance_t *p_instance,
                                 libvlc_event_type_t i_event_type,
                                 libvlc_callback_t f_callback,
                                 void *user_data,
@@ -81,7 +105,7 @@ void libvlc_callback_register_for_event( libvlc_instance_t *p_instance,
 
     int res = var_AddCallback( p_instance->p_libvlc_int,
                                callback_name,
-                               handle_callback,
+                               handle_event,
                                entry );
     
     if (res != VLC_SUCCESS)
@@ -95,7 +119,7 @@ void libvlc_callback_register_for_event( libvlc_instance_t *p_instance,
     return;
 }
 
-void libvlc_callback_unregister_for_event( libvlc_instance_t *p_instance,
+void libvlc_event_remove_callback( libvlc_instance_t *p_instance,
                                    libvlc_event_type_t i_event_type,
                                    libvlc_callback_t f_callback,
                                    void *p_user_data,

src/control/libvlc_internal.h

@@ -78,22 +78,6 @@ struct libvlc_input_t
     struct libvlc_instance_t *p_instance; ///< Parent instance
 };
 
-
-static inline void add_callback_entry( struct libvlc_callback_entry_t *entry,
-                                       struct libvlc_callback_entry_list_t **list )
-{
-    struct libvlc_callback_entry_list_t *new_listitem;
-    new_listitem = malloc( sizeof( struct libvlc_callback_entry_list_t ) );
-    new_listitem->elmt = entry;
-    new_listitem->next = *list;
-    new_listitem->prev = NULL;
-
-    if(*list)
-        (*list)->prev = new_listitem;
-
-    *list = new_listitem;
-}
-
 #define RAISENULL( psz,a... ) { libvlc_exception_raise( p_e, psz,##a ); \
                                 return NULL; }
 #define RAISEVOID( psz,a... ) { libvlc_exception_raise( p_e, psz,##a ); \