X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=test%2Flibvlc%2Fmedia_player.c;h=8ebde89d2bed30061bc25af977ede7b4e7442a38;hb=2c57cb8088288aaf3540cb28fd80978799a66c48;hp=a14a038825b0e806d425ede0aab524c454101abe;hpb=6d656addd5f9d7f47f64070200398ac96c7f547b;p=vlc diff --git a/test/libvlc/media_player.c b/test/libvlc/media_player.c index a14a038825..8ebde89d2b 100644 --- a/test/libvlc/media_player.c +++ b/test/libvlc/media_player.c @@ -50,22 +50,16 @@ static void test_media_player_play_stop(const char** argv, int argc) /* 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) @@ -97,7 +91,7 @@ static void test_media_player_pause_stop(const char** argv, int argc) /* 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 && @@ -115,24 +109,17 @@ static void test_media_player_pause_stop(const char** argv, int argc) /* 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 (); }