LibVLC teletext: various fixes

[vlc] / src / control / event.c

diff --git a/src/control/event.c b/src/control/event.c
index c368c1a0d7b1b66d89596456745428a211d59da9..af3f043c9af2a3222734360daa49d4685494d88d 100644 (file)
--- a/src/control/event.c
+++ b/src/control/event.c
@@ -31,6 +31,8 @@
 
 #include "libvlc_internal.h"
 #include "event_internal.h"
+#include <assert.h>
+#include <errno.h>
 
 typedef struct libvlc_event_listeners_group_t
 {
@@ -66,15 +68,14 @@ group_contains_listener( libvlc_event_listeners_group_t * group,
  * Init an object's event manager.
  **************************************************************************/
 libvlc_event_manager_t *
-libvlc_event_manager_new( void * p_obj, libvlc_instance_t * p_libvlc_inst,
-                           libvlc_exception_t *p_e )
+libvlc_event_manager_new( void * p_obj, libvlc_instance_t * p_libvlc_inst )
 {
     libvlc_event_manager_t * p_em;
 
     p_em = malloc(sizeof( libvlc_event_manager_t ));
     if( !p_em )
     {
-        libvlc_exception_raise( p_e, "No Memory left" );
+        libvlc_printerr( "Not enough memory" );
         return NULL;
     }
 
@@ -127,17 +128,10 @@ void libvlc_event_manager_release( libvlc_event_manager_t * p_em )
  **************************************************************************/
 void libvlc_event_manager_register_event_type(
         libvlc_event_manager_t * p_em,
-        libvlc_event_type_t event_type,
-        libvlc_exception_t * p_e )
+        libvlc_event_type_t event_type )
 {
     libvlc_event_listeners_group_t * listeners_group;
-    listeners_group = malloc(sizeof(libvlc_event_listeners_group_t));
-    if( !listeners_group )
-    {
-        libvlc_exception_raise( p_e, "No Memory left" );
-        return;
-    }
-
+    listeners_group = xmalloc(sizeof(libvlc_event_listeners_group_t));
     listeners_group->event_type = event_type;
     vlc_array_init( &listeners_group->listeners );
 
@@ -273,23 +267,18 @@ const char * libvlc_event_type_name( libvlc_event_type_t event_type )
  * Add a callback for an event.
  **************************************************************************/
 static
-void event_attach( libvlc_event_manager_t * p_event_manager,
-                         libvlc_event_type_t event_type,
-                         libvlc_callback_t pf_callback,
-                         void *p_user_data,
-                         bool is_asynchronous,
-                         libvlc_exception_t *p_e )
+int event_attach( libvlc_event_manager_t * p_event_manager,
+                  libvlc_event_type_t event_type,
+                  libvlc_callback_t pf_callback, void *p_user_data,
+                  bool is_asynchronous )
 {
     libvlc_event_listeners_group_t * listeners_group;
     libvlc_event_listener_t * listener;
     int i;
     
     listener = malloc(sizeof(libvlc_event_listener_t));
-    if( !listener )
-    {
-        libvlc_exception_raise( p_e, "No Memory left" );
-        return;
-    }
+    if( unlikely(listener == NULL) )
+        return ENOMEM;
     
     listener->event_type = event_type;
     listener->p_user_data = p_user_data;
@@ -304,15 +293,16 @@ void event_attach( libvlc_event_manager_t * p_event_manager,
         {
             vlc_array_append( &listeners_group->listeners, listener );
             vlc_mutex_unlock( &p_event_manager->object_lock );
-            return;
+            return 0;
         }
     }
     vlc_mutex_unlock( &p_event_manager->object_lock );
     
     free(listener);
-    libvlc_exception_raise( p_e,
-                           "This object event manager doesn't know about '%s' events",
-                           libvlc_event_type_name(event_type));
+    fprintf( stderr, "This object event manager doesn't know about '%s' events",
+             libvlc_event_type_name(event_type) );
+    assert(0);
+    return -1;
 }
 
 /**************************************************************************
@@ -320,13 +310,13 @@ void event_attach( libvlc_event_manager_t * p_event_manager,
  *
  * Add a callback for an event.
  **************************************************************************/
-void libvlc_event_attach( libvlc_event_manager_t * p_event_manager,
+int libvlc_event_attach( libvlc_event_manager_t * p_event_manager,
                          libvlc_event_type_t event_type,
                          libvlc_callback_t pf_callback,
-                         void *p_user_data,
-                         libvlc_exception_t *p_e )
+                         void *p_user_data )
 {
-    event_attach(p_event_manager, event_type, pf_callback, p_user_data, false /* synchronous */, p_e);
+    return event_attach(p_event_manager, event_type, pf_callback, p_user_data,
+                        false /* synchronous */);
 }
 
 /**************************************************************************
@@ -337,10 +327,10 @@ void libvlc_event_attach( libvlc_event_manager_t * p_event_manager,
 void libvlc_event_attach_async( libvlc_event_manager_t * p_event_manager,
                          libvlc_event_type_t event_type,
                          libvlc_callback_t pf_callback,
-                         void *p_user_data,
-                         libvlc_exception_t *p_e )
+                         void *p_user_data )
 {
-    event_attach(p_event_manager, event_type, pf_callback, p_user_data, true /* asynchronous */, p_e);
+    event_attach(p_event_manager, event_type, pf_callback, p_user_data,
+                 true /* asynchronous */);
 }
 
 /**************************************************************************
@@ -351,8 +341,7 @@ void libvlc_event_attach_async( libvlc_event_manager_t * p_event_manager,
 void libvlc_event_detach( libvlc_event_manager_t *p_event_manager,
                                      libvlc_event_type_t event_type,
                                      libvlc_callback_t pf_callback,
-                                     void *p_user_data,
-                                     libvlc_exception_t *p_e )
+                                     void *p_user_data )
 {
     libvlc_event_listeners_group_t * listeners_group;
     libvlc_event_listener_t * listener;
@@ -399,10 +388,5 @@ void libvlc_event_detach( libvlc_event_manager_t *p_event_manager,
 
     libvlc_event_async_ensure_listener_removal(p_event_manager, &listener_to_remove);
 
-    if(!found)
-    {
-        libvlc_exception_raise( p_e,
-                               "This object event manager doesn't know about '%s,%p,%p' event observer",
-                               libvlc_event_type_name(event_type), pf_callback, p_user_data );        
-    }
+    assert(found);
 }