videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-16 16:02:54 +02:00
Code Releases Activity

test: Fix media_player test.

Browse Source 
libvlc_Ended is the state we want to check.
When paused, if the media ended before, we need to allow that state.
This commit is contained in:
Pierre d'Herbemont 2009-05-20 22:38:00 -07:00
parent 6676622d00
commit 3ff6ba0b53
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/libvlc/media_player.c
View File

@ -54,9 +54,9 @@ static void test_media_player_play_stop(const char** argv, int argc)
catch ();
} while( state != libvlc_Playing &&
state != libvlc_Error &&
state != libvlc_MediaPlayerEndReached );
state != libvlc_Ended );
assert( state == libvlc_Playing || state == libvlc_MediaPlayerEndReached );
assert( state == libvlc_Playing || state == libvlc_Ended );
libvlc_media_player_stop (mi, &ex);
catch ();
@ -75,7 +75,7 @@ static void test_media_player_pause_stop(const char** argv, int argc)
libvlc_media_player_t *mi;
const char * file = test_default_sample;
log ("Testing play and pause of %s\n", file);
log ("Testing pause and stop of %s\n", file);
libvlc_exception_init (&ex);
vlc = libvlc_new (argc, argv, &ex);
@ -92,6 +92,8 @@ static void test_media_player_pause_stop(const char** argv, int argc)
libvlc_media_player_play (mi, &ex);
catch ();
log ("Waiting for playing\n");
/* Wait a correct state */
libvlc_state_t state;
do {
@ -99,11 +101,14 @@ static void test_media_player_pause_stop(const char** argv, int argc)
catch ();
} while( state != libvlc_Playing &&
state != libvlc_Error &&
state != libvlc_MediaPlayerEndReached );
state != libvlc_Ended );
assert( state == libvlc_Playing || state == libvlc_MediaPlayerEndReached );
assert( state == libvlc_Playing || state == libvlc_Ended );
libvlc_media_player_pause (mi, &ex);
catch();
log ("Waiting for pause\n");
/* Wait a correct state */
do {
@ -111,9 +116,9 @@ static void test_media_player_pause_stop(const char** argv, int argc)
catch ();
} while( state != libvlc_Paused &&
state != libvlc_Error &&
state != libvlc_MediaPlayerEndReached );
state != libvlc_Ended );
assert( libvlc_media_player_get_state (mi, &ex) == libvlc_Paused );
assert( state == libvlc_Paused || state == libvlc_Ended );
catch();
libvlc_media_player_stop (mi, &ex);