vlc | branch: master | Thomas Guillem <[email protected]> | Tue Jun 9 15:29:10 2020 +0200| [30c17d41132b0fae57a04a3f1b97e43f04d54bb4] | committer: Thomas Guillem
test: media_player: use "mock://" > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=30c17d41132b0fae57a04a3f1b97e43f04d54bb4 --- test/libvlc/media_list_player.c | 20 ++++++++++---------- test/libvlc/media_player.c | 7 ++++--- test/libvlc/test.h | 5 +---- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/test/libvlc/media_list_player.c b/test/libvlc/media_list_player.c index 27cf3e1fbc..b80deddb46 100644 --- a/test/libvlc/media_list_player.c +++ b/test/libvlc/media_list_player.c @@ -121,7 +121,7 @@ static void test_media_list_player_items_queue(const char** argv, int argc) vlc = libvlc_new (argc, argv); assert (vlc != NULL); - md = libvlc_media_new_path (vlc, file); + md = libvlc_media_new_location (vlc, file); assert(md); ml = libvlc_media_list_new (vlc); @@ -186,7 +186,7 @@ static void test_media_list_player_previous(const char** argv, int argc) vlc = libvlc_new (argc, argv); assert (vlc != NULL); - md = libvlc_media_new_path (vlc, file); + md = libvlc_media_new_location (vlc, file); assert(md); ml = libvlc_media_list_new (vlc); @@ -245,7 +245,7 @@ static void test_media_list_player_next(const char** argv, int argc) vlc = libvlc_new (argc, argv); assert (vlc != NULL); - md = libvlc_media_new_path (vlc, file); + md = libvlc_media_new_location (vlc, file); assert(md); ml = libvlc_media_list_new (vlc); @@ -304,7 +304,7 @@ static void test_media_list_player_pause_stop(const char** argv, int argc) vlc = libvlc_new (argc, argv); assert (vlc != NULL); - md = libvlc_media_new_path (vlc, file); + md = libvlc_media_new_location (vlc, file); assert(md); ml = libvlc_media_list_new (vlc); @@ -344,7 +344,7 @@ static void test_media_list_player_play_item_at_index(const char** argv, int arg vlc = libvlc_new (argc, argv); assert (vlc != NULL); - md = libvlc_media_new_path (vlc, file); + md = libvlc_media_new_location (vlc, file); assert(md); ml = libvlc_media_list_new (vlc); @@ -403,19 +403,19 @@ static void test_media_list_player_playback_options (const char** argv, int argc * ml5&6: 0 0 -- 1 */ - md = libvlc_media_new_path (vlc, file); + md = libvlc_media_new_location (vlc, file); assert(md); - md2 = libvlc_media_new_path (vlc, file); + md2 = libvlc_media_new_location (vlc, file); assert(md2); - md3 = libvlc_media_new_path (vlc, file); + md3 = libvlc_media_new_location (vlc, file); assert(md3); - md4 = libvlc_media_new_path (vlc, file); + md4 = libvlc_media_new_location (vlc, file); assert(md4); - md5 = libvlc_media_new_path (vlc, file); + md5 = libvlc_media_new_location (vlc, file); assert(md5); ml = libvlc_media_list_new (vlc); diff --git a/test/libvlc/media_player.c b/test/libvlc/media_player.c index 10f56abb9e..5a7cb3e216 100644 --- a/test/libvlc/media_player.c +++ b/test/libvlc/media_player.c @@ -129,7 +129,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_path (vlc, file); + libvlc_media_t *md = libvlc_media_new_location (vlc, file); assert (md != NULL); libvlc_media_player_t *mp = libvlc_media_player_new (vlc); @@ -158,7 +158,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_path (vlc, file); + md = libvlc_media_new_location (vlc, file); assert (md != NULL); mi = libvlc_media_player_new_from_media (md); @@ -185,7 +185,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_path (vlc, file); + md = libvlc_media_new_location (vlc, file); assert (md != NULL); mi = libvlc_media_player_new_from_media (md); @@ -217,6 +217,7 @@ int main (void) 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); +// test_media_player_tracks (test_defaults_args, test_defaults_nargs); return 0; } diff --git a/test/libvlc/test.h b/test/libvlc/test.h index 9d58d0d328..c7b4526174 100644 --- a/test/libvlc/test.h +++ b/test/libvlc/test.h @@ -53,10 +53,7 @@ static const char * test_defaults_args[] = { static const int test_defaults_nargs = sizeof (test_defaults_args) / sizeof (test_defaults_args[0]); -/*static const char test_default_sample[] = "samples/test.sample";*/ -static const char test_default_sample[] = SRCDIR"/samples/empty.voc"; -static const char test_default_video[] = SRCDIR"/samples/image.jpg"; - +static const char test_default_sample[] = "mock://"; /********************************************************************* * Some useful common functions _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
