Fix copyright.

[vlc] / test / libvlc / media_player.c

diff --git a/test/libvlc/media_player.c b/test/libvlc/media_player.c
index 2137fa7210cc8176dea43a2d91f15486026a73d1..cba2a90fb2b915e9f5c0dda37592d769a0fbf014 100644 (file)
--- a/test/libvlc/media_player.c
+++ b/test/libvlc/media_player.c
@@ -23,6 +23,42 @@
 
 #include "test.h"
 
+static void test_media_player_set_media(const char** argv, int argc)
+{
+    const char * file = test_default_sample;
+
+    log ("Testing set_media\n");
+
+    libvlc_instance_t *vlc = libvlc_new (argc, argv);
+    assert (vlc != NULL);
+
+    libvlc_media_t *md = libvlc_media_new_path (vlc, file);
+    assert (md != NULL);
+
+    libvlc_media_player_t *mp = libvlc_media_player_new (vlc);
+    assert (mp != NULL);
+
+    libvlc_media_player_set_media (mp, md);
+
+    libvlc_media_release (md);
+
+    libvlc_media_player_play (mp);
+
+    /* Wait a correct state */
+    libvlc_state_t state;
+    do {
+        state = libvlc_media_player_get_state (mp);
+    } while(state != libvlc_Playing &&
+            state != libvlc_Error &&
+            state != libvlc_Ended );
+
+    assert(state == libvlc_Playing || state == libvlc_Ended);
+
+    libvlc_media_player_stop (mp);
+    libvlc_media_player_release (mp);
+    libvlc_release (vlc);
+}
+
 static void test_media_player_play_stop(const char** argv, int argc)
 {
     libvlc_instance_t *vlc;
@@ -32,12 +68,11 @@ 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);
     assert (vlc != NULL);
 
-    md = libvlc_media_new (vlc, file, &ex);
-    catch ();
+    md = libvlc_media_new_path (vlc, file);
+    assert (md != NULL);
 
     mi = libvlc_media_player_new_from_media (md);
     assert (mi != NULL);
@@ -70,12 +105,11 @@ 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);
     assert (vlc != NULL);
 
-    md = libvlc_media_new (vlc, file, &ex);
-    catch ();
+    md = libvlc_media_new_path (vlc, file);
+    assert (md != NULL);
 
     mi = libvlc_media_player_new_from_media (md);
     assert (mi != NULL);
@@ -90,7 +124,6 @@ static void test_media_player_pause_stop(const char** argv, int argc)
     libvlc_state_t state;
     do {
         state = libvlc_media_player_get_state (mi);
-        catch ();
     } while( state != libvlc_Playing &&
              state != libvlc_Error &&
              state != libvlc_Ended );
@@ -113,7 +146,7 @@ static void test_media_player_pause_stop(const char** argv, int argc)
 
     assert( state == libvlc_Paused || state == libvlc_Ended );
 #endif
-    
+
     libvlc_media_player_stop (mi);
     libvlc_media_player_release (mi);
     libvlc_release (vlc);
@@ -124,6 +157,7 @@ int main (void)
 {
     test_init();
 
+    test_media_player_set_media (test_defaults_args, test_defaults_nargs);
     test_media_player_play_stop (test_defaults_args, test_defaults_nargs);
     test_media_player_pause_stop (test_defaults_args, test_defaults_nargs);