X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=test%2Flibvlc%2Fmedia_player.c;h=2137fa7210cc8176dea43a2d91f15486026a73d1;hb=09020b63ba7513eeaff38f1cc40e2b4937c61030;hp=a14a038825b0e806d425ede0aab524c454101abe;hpb=1c53f2aa61c9a32b1feec031cda2534ecc592c19;p=vlc

diff --git a/test/libvlc/media_player.c b/test/libvlc/media_player.c
index a14a038825..2137fa7210 100644
--- a/test/libvlc/media_player.c
+++ b/test/libvlc/media_player.c
@@ -33,39 +33,32 @@ static void test_media_player_play_stop(const char** argv, int argc)
     log ("Testing play and pause of %s\n", file);
 
     libvlc_exception_init (&ex);
-    vlc = libvlc_new (argc, argv, &ex);
-    catch ();
+    vlc = libvlc_new (argc, argv);
+    assert (vlc != NULL);
 
     md = libvlc_media_new (vlc, file, &ex);
     catch ();
 
-    mi = libvlc_media_player_new_from_media (md, &ex);
-    catch ();
+    mi = libvlc_media_player_new_from_media (md);
+    assert (mi != NULL);
 
     libvlc_media_release (md);
 
-    libvlc_media_player_play (mi, &ex);
-    catch ();
+    libvlc_media_player_play (mi);
 
     /* Wait a correct state */
     libvlc_state_t state;
     do {
-        state = libvlc_media_player_get_state (mi, &ex);
-        catch ();
+        state = libvlc_media_player_get_state (mi);
     } while( state != libvlc_Playing &&
              state != libvlc_Error &&
              state != libvlc_Ended );
 
     assert( state == libvlc_Playing || state == libvlc_Ended );
 
-    libvlc_media_player_stop (mi, &ex);
-    catch ();
-
+    libvlc_media_player_stop (mi);
     libvlc_media_player_release (mi);
-    catch ();
-
     libvlc_release (vlc);
-    catch ();
 }
 
 static void test_media_player_pause_stop(const char** argv, int argc)
@@ -78,26 +71,25 @@ static void test_media_player_pause_stop(const char** argv, int argc)
     log ("Testing pause and stop of %s\n", file);
 
     libvlc_exception_init (&ex);
-    vlc = libvlc_new (argc, argv, &ex);
-    catch ();
+    vlc = libvlc_new (argc, argv);
+    assert (vlc != NULL);
 
     md = libvlc_media_new (vlc, file, &ex);
     catch ();
 
-    mi = libvlc_media_player_new_from_media (md, &ex);
-    catch ();
+    mi = libvlc_media_player_new_from_media (md);
+    assert (mi != NULL);
 
     libvlc_media_release (md);
 
-    libvlc_media_player_play (mi, &ex);
-    catch ();
+    libvlc_media_player_play (mi);
 
     log ("Waiting for playing\n");
 
     /* Wait a correct state */
     libvlc_state_t state;
     do {
-        state = libvlc_media_player_get_state (mi, &ex);
+        state = libvlc_media_player_get_state (mi);
         catch ();
     } while( state != libvlc_Playing &&
              state != libvlc_Error &&
@@ -108,31 +100,23 @@ static void test_media_player_pause_stop(const char** argv, int argc)
 #if 0
     /* This can't work because under some condition (short file, this is the case) this will be
      * equivalent to a play() */
-    libvlc_media_player_pause (mi, &ex);
-    catch();
+    libvlc_media_player_pause (mi);
 
     log ("Waiting for pause\n");
 
     /* Wait a correct state */
     do {
-        state = libvlc_media_player_get_state (mi, &ex);
-        catch ();
+        state = libvlc_media_player_get_state (mi);
     } while( state != libvlc_Paused &&
             state != libvlc_Error &&
             state != libvlc_Ended );
 
     assert( state == libvlc_Paused || state == libvlc_Ended );
-    catch();
 #endif
     
-    libvlc_media_player_stop (mi, &ex);
-    catch ();
-
+    libvlc_media_player_stop (mi);
     libvlc_media_player_release (mi);
-    catch ();
-
     libvlc_release (vlc);
-    catch ();
 }