LibVLC core: remove exceptions

[vlc] / test / libvlc / events.c

diff --git a/test/libvlc/events.c b/test/libvlc/events.c
index af860b811b9d11613b32e0458310736df3770134..17d5a8aedd23091720b539c696d4a9fedd1d4d80 100644 (file)
--- a/test/libvlc/events.c
+++ b/test/libvlc/events.c
@@ -31,27 +31,26 @@ extern void libvlc_event_send( libvlc_event_manager_t *, libvlc_event_t *);
 static void test_events_dummy_callback( const libvlc_event_t * event, void * user_data)
 {
     (void)event;
-    vlc_bool_t * callback_was_called = user_data;
-    *callback_was_called = VLC_TRUE;
+    bool * callback_was_called = user_data;
+    *callback_was_called = true;
 }
 
 static void test_events_callback_and_detach( const libvlc_event_t * event, void * user_data)
 {
-    vlc_bool_t * callback_was_called = user_data;
+    bool * callback_was_called = user_data;
     libvlc_event_manager_t *em;
 
-    em = libvlc_media_player_event_manager (event->p_obj, &ex);
-    catch();
+    em = libvlc_media_player_event_manager (event->p_obj);
 
-    libvlc_event_detach (em, event->type, test_events_callback_and_detach, user_data, &ex);
-    *callback_was_called = VLC_TRUE;
+    libvlc_event_detach (em, event->type, test_events_callback_and_detach, user_data);
+    *callback_was_called = true;
 }
 
-static void test_event_type_reception( libvlc_event_manager_t * em, libvlc_event_type_t event_type, vlc_bool_t * callback_was_called )
+static void test_event_type_reception( libvlc_event_manager_t * em, libvlc_event_type_t event_type, bool * callback_was_called )
 {
     libvlc_event_t event;
     event.type = event_type;
-    *callback_was_called = VLC_FALSE;
+    *callback_was_called = false;
     libvlc_event_send (em, &event);
     assert (*callback_was_called);
 }
@@ -61,70 +60,69 @@ static void test_events (const char ** argv, int argc)
     libvlc_instance_t *vlc;
     libvlc_media_player_t *mi;
     libvlc_event_manager_t *em;
-    vlc_bool_t callback_was_called;
+    bool callback_was_called;
     libvlc_exception_t ex;
     libvlc_event_type_t mi_events[] = {
-        libvlc_MediaPlayerPlayed,
+        libvlc_MediaPlayerPlaying,
         libvlc_MediaPlayerPaused,
         libvlc_MediaPlayerEndReached,
-        libvlc_MediaPlayerStopped,
         libvlc_MediaPlayerEncounteredError,
         libvlc_MediaPlayerTimeChanged,
         libvlc_MediaPlayerPositionChanged,
     };
-    int i, mi_events_len = sizeof(mi_events)/sizeof(*mi_events);
+    int mi_events_len = sizeof(mi_events)/sizeof(*mi_events);
 
     log ("Testing events\n");
 
     libvlc_exception_init (&ex);
-    vlc = libvlc_new (argc, argv, &ex);
-    catch ();
+    vlc = libvlc_new (argc, argv);
+    assert (vlc != NULL);
 
-    mi = libvlc_media_player_new (vlc, &ex);
-    catch ();
+    mi = libvlc_media_player_new (vlc);
+    assert (mi != NULL);
 
-    em = libvlc_media_player_event_manager (mi, &ex);
+    em = libvlc_media_player_event_manager (mi);
 
     log ("+ Testing attaching to Media Instance\n");
 
-    for (i = 0; i < mi_events_len; i++) {
-        libvlc_event_attach (em, mi_events[i], test_events_dummy_callback, &callback_was_called, &ex);
-        catch ();
+    for (int i = 0; i < mi_events_len; i++) {
+        int ret;
+
+        ret = libvlc_event_attach (em, mi_events[i],
+                                   test_events_dummy_callback,
+                                   &callback_was_called);
+        assert(ret == 0);
     }
 
     log ("+ Testing event reception\n");
 
-    for (i = 0; i < mi_events_len; i++)
+    for (int i = 0; i < mi_events_len; i++)
         test_event_type_reception (em, mi_events[i], &callback_was_called);
 
     log ("+ Testing event detaching while in the event callback\n");
 
     libvlc_event_t event;
     event.type = mi_events[mi_events_len-1];
-    callback_was_called = VLC_FALSE;
+    callback_was_called = false;
 
-    libvlc_event_detach (em, mi_events[mi_events_len-1], test_events_dummy_callback, &callback_was_called, &ex);
-    catch ();
+    libvlc_event_detach (em, mi_events[mi_events_len-1], test_events_dummy_callback, &callback_was_called);
 
-    libvlc_event_attach (em, mi_events[mi_events_len-1], test_events_callback_and_detach, &callback_was_called, &ex);
-    catch ();
+    int val = libvlc_event_attach (em, mi_events[mi_events_len-1],
+                                   test_events_callback_and_detach,
+                                   &callback_was_called);
+    assert (val == 0);
 
     libvlc_event_send (em, &event);
     assert( callback_was_called );
 
-    callback_was_called = VLC_FALSE;
+    callback_was_called = false;
     libvlc_event_send (em, &event);
     assert( !callback_was_called );
 
-    libvlc_event_detach (em, mi_events[mi_events_len-1], test_events_callback_and_detach, &callback_was_called, &ex);
-    catch ();
-
     log ("+ Testing regular detach()\n");
 
-    for (i = 0; i < mi_events_len - 1; i++) {
-        libvlc_event_detach (em, mi_events[i], test_events_dummy_callback, &callback_was_called, &ex);
-        catch ();
-    }
+    for (int i = 0; i < mi_events_len - 1; i++)
+        libvlc_event_detach (em, mi_events[i], test_events_dummy_callback, &callback_was_called);
 
     libvlc_media_player_release (mi);
     catch ();