[vlc-commits] test: media_discoverer: test a specific sd from command line
Thomas Guillem
git at videolan.org
Mon Jun 13 10:58:09 CEST 2016
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Jun 13 10:56:00 2016 +0200| [3e7711177d4df1d853eed89f5be29e86c305ef2a] | committer: Thomas Guillem
test: media_discoverer: test a specific sd from command line
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3e7711177d4df1d853eed89f5be29e86c305ef2a
---
test/libvlc/media_discoverer.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/test/libvlc/media_discoverer.c b/test/libvlc/media_discoverer.c
index c3bf7f2..09c20bd 100644
--- a/test/libvlc/media_discoverer.c
+++ b/test/libvlc/media_discoverer.c
@@ -48,7 +48,7 @@ ml_item_deleted(const struct libvlc_event_t *p_ev, void *p_data)
}
static void
-test_discoverer(libvlc_instance_t *p_vlc, const char *psz_name)
+test_discoverer(libvlc_instance_t *p_vlc, const char *psz_name, bool b_wait)
{
log("creating and starting discoverer %s\n", psz_name);
@@ -77,6 +77,11 @@ test_discoverer(libvlc_instance_t *p_vlc, const char *psz_name)
else
{
assert(libvlc_media_discoverer_is_running(p_md));
+ if (b_wait)
+ {
+ log("Press any keys to stop\n");
+ getchar();
+ }
libvlc_media_discoverer_stop(p_md);
}
@@ -90,14 +95,25 @@ test_discoverer(libvlc_instance_t *p_vlc, const char *psz_name)
}
int
-main (void)
+main(int i_argc, char *ppsz_argv[])
{
test_init();
+ char *psz_test_name = i_argc > 1 ? ppsz_argv[1] : NULL;
+
libvlc_instance_t *p_vlc = libvlc_new(test_defaults_nargs,
test_defaults_args);
assert(p_vlc != NULL);
+ if (psz_test_name != NULL)
+ {
+ /* Test a specific service discovery from command line */
+ alarm(0);
+ test_discoverer(p_vlc, psz_test_name, true);
+ libvlc_release(p_vlc);
+ return 0;
+ }
+
for(libvlc_media_discoverer_category i_cat = libvlc_media_discoverer_devices;
i_cat <= libvlc_media_discoverer_localdirs; i_cat ++)
{
@@ -127,7 +143,7 @@ main (void)
/* see comment in libvlc_media_discoverer_new() */
continue;
}
- test_discoverer(p_vlc, p_service->psz_name);
+ test_discoverer(p_vlc, p_service->psz_name, false);
}
libvlc_media_discoverer_list_release(pp_services, i_count);
}
More information about the vlc-commits
mailing list