Remove outdated WinCE howto

[vlc] / test / libvlc / media_player.c

diff --git a/test/libvlc/media_player.c b/test/libvlc/media_player.c
index a843b65d5727f995271c2262c9a1a820a01ee747..258d825f0289c0870f843901ab459ea379586cb1 100644 (file)
--- a/test/libvlc/media_player.c
+++ b/test/libvlc/media_player.c
@@ -23,6 +23,56 @@
 
 #include "test.h"
 
+static void wait_playing(libvlc_media_player_t *mp)
+{
+    libvlc_state_t state;
+    do {
+        state = libvlc_media_player_get_state (mp);
+    } while(state != libvlc_Playing &&
+            state != libvlc_Error &&
+            state != libvlc_Ended );
+
+    state = libvlc_media_player_get_state (mp);
+    assert(state == libvlc_Playing || state == libvlc_Ended);
+}
+
+static void wait_paused(libvlc_media_player_t *mp)
+{
+    libvlc_state_t state;
+    do {
+        state = libvlc_media_player_get_state (mp);
+    } while(state != libvlc_Paused &&
+            state != libvlc_Ended );
+
+    state = libvlc_media_player_get_state (mp);
+    assert(state == libvlc_Paused || state == libvlc_Ended);
+}
+
+/* Test a bunch of A/V properties. This most does nothing since the current
+ * test file contains a dummy audio track. This is a smoke test. */
+static void test_audio_video(libvlc_media_player_t *mp)
+{
+    bool fs = libvlc_get_fullscreen(mp);
+    libvlc_set_fullscreen(mp, true);
+    assert(libvlc_get_fullscreen(mp));
+    libvlc_set_fullscreen(mp, false);
+    assert(!libvlc_get_fullscreen(mp));
+    libvlc_toggle_fullscreen(mp);
+    assert(libvlc_get_fullscreen(mp));
+    libvlc_toggle_fullscreen(mp);
+    assert(!libvlc_get_fullscreen(mp));
+    libvlc_set_fullscreen(mp, fs);
+    assert(libvlc_get_fullscreen(mp) == fs);
+
+    assert(libvlc_video_get_scale(mp) == 0.); /* default */
+    libvlc_video_set_scale(mp, 0.); /* no-op */
+    libvlc_video_set_scale(mp, 2.5);
+    assert(libvlc_video_get_scale(mp) == 2.5);
+    libvlc_video_set_scale(mp, 0.);
+    libvlc_video_set_scale(mp, 0.); /* no-op */
+    assert(libvlc_video_get_scale(mp) == 0.);
+}
+
 static void test_media_player_set_media(const char** argv, int argc)
 {
     const char * file = test_default_sample;
@@ -32,7 +82,7 @@ static void test_media_player_set_media(const char** argv, int argc)
     libvlc_instance_t *vlc = libvlc_new (argc, argv);
     assert (vlc != NULL);
 
-    libvlc_media_t *md = libvlc_media_new (vlc, file);
+    libvlc_media_t *md = libvlc_media_new_path (vlc, file);
     assert (md != NULL);
 
     libvlc_media_player_t *mp = libvlc_media_player_new (vlc);
@@ -44,15 +94,7 @@ static void test_media_player_set_media(const char** argv, int argc)
 
     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);
+    wait_playing (mp);
 
     libvlc_media_player_stop (mp);
     libvlc_media_player_release (mp);
@@ -71,7 +113,7 @@ static void test_media_player_play_stop(const char** argv, int argc)
     vlc = libvlc_new (argc, argv);
     assert (vlc != NULL);
 
-    md = libvlc_media_new (vlc, file);
+    md = libvlc_media_new_path (vlc, file);
     assert (md != NULL);
 
     mi = libvlc_media_player_new_from_media (md);
@@ -81,15 +123,7 @@ static void test_media_player_play_stop(const char** argv, int argc)
 
     libvlc_media_player_play (mi);
 
-    /* Wait a correct state */
-    libvlc_state_t state;
-    do {
-        state = libvlc_media_player_get_state (mi);
-    } while( state != libvlc_Playing &&
-             state != libvlc_Error &&
-             state != libvlc_Ended );
-
-    assert( state == libvlc_Playing || state == libvlc_Ended );
+    wait_playing (mi);
 
     libvlc_media_player_stop (mi);
     libvlc_media_player_release (mi);
@@ -108,7 +142,7 @@ static void test_media_player_pause_stop(const char** argv, int argc)
     vlc = libvlc_new (argc, argv);
     assert (vlc != NULL);
 
-    md = libvlc_media_new (vlc, file);
+    md = libvlc_media_new_path (vlc, file);
     assert (md != NULL);
 
     mi = libvlc_media_player_new_from_media (md);
@@ -116,38 +150,21 @@ static void test_media_player_pause_stop(const char** argv, int argc)
 
     libvlc_media_release (md);
 
-    libvlc_media_player_play (mi);
+    test_audio_video(mi);
 
+    libvlc_media_player_play (mi);
     log ("Waiting for playing\n");
+    wait_playing (mi);
+    test_audio_video(mi);
 
-    /* Wait a correct state */
-    libvlc_state_t state;
-    do {
-        state = libvlc_media_player_get_state (mi);
-    } while( state != libvlc_Playing &&
-             state != libvlc_Error &&
-             state != libvlc_Ended );
-
-    assert( state == libvlc_Playing || state == libvlc_Ended );
-
-#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);
-
+    libvlc_media_player_set_pause (mi, true);
     log ("Waiting for pause\n");
-
-    /* Wait a correct state */
-    do {
-        state = libvlc_media_player_get_state (mi);
-    } while( state != libvlc_Paused &&
-            state != libvlc_Error &&
-            state != libvlc_Ended );
-
-    assert( state == libvlc_Paused || state == libvlc_Ended );
-#endif
+    wait_paused (mi);
+    test_audio_video(mi);
 
     libvlc_media_player_stop (mi);
+    test_audio_video(mi);
+
     libvlc_media_player_release (mi);
     libvlc_release (vlc);
 }