This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/xawtv3.git tree:
Subject: Prints the used plugin (v4l2 or libv4l) Author: Mauro Carvalho Chehab <[email protected]> Date: Sat Jan 29 17:01:16 2011 -0200 Signed-off-by: Mauro Carvalho Chehab <[email protected]> libng/plugins/Subdir.mk | 2 +- libng/plugins/drv0-v4l2.tmpl.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) --- http://git.linuxtv.org/xawtv3.git?a=commitdiff;h=b31be737fb1040b56c8f501a528dcd5f077bc6ce diff --git a/libng/plugins/Subdir.mk b/libng/plugins/Subdir.mk index 3be9933..8fb54fd 100644 --- a/libng/plugins/Subdir.mk +++ b/libng/plugins/Subdir.mk @@ -85,7 +85,7 @@ libng/plugins/drv0-libv4l.o: libng/plugins/drv0-v4l2.tmpl.c @$(compile_c) @$(fixup_deps) -../libng/plugins/drv0-v4l2.o: libng/plugins/drv0-v4l2.tmpl.c +libng/plugins/drv0-v4l2.o: libng/plugins/drv0-v4l2.tmpl.c @$(echo_compile_c) @$(compile_c) @$(fixup_deps) diff --git a/libng/plugins/drv0-v4l2.tmpl.c b/libng/plugins/drv0-v4l2.tmpl.c index 43c924a..5c0c2d0 100644 --- a/libng/plugins/drv0-v4l2.tmpl.c +++ b/libng/plugins/drv0-v4l2.tmpl.c @@ -32,6 +32,10 @@ #ifdef USE_LIBV4L #include <libv4l2.h> + +#define PLUGIN_NAME "libv4l" +#else +#define PLUGIN_NAME "v4l2" #endif /* USE_LIBV4L */ /* ---------------------------------------------------------------------- */ @@ -114,11 +118,7 @@ struct v4l2_handle { /* ---------------------------------------------------------------------- */ struct ng_vid_driver v4l2_driver = { -#ifndef USE_LIBV4L - name: "v4l2", -#else - name: "libv4l", -#endif /* USE_LIBV4L */ + name: PLUGIN_NAME, open: v4l2_open_handle, close: v4l2_close_handle, @@ -468,6 +468,8 @@ v4l2_open_handle(char *device) int libv4l2_fd; #endif /* USE_LIBV4L */ + fprintf(stderr, "Using %s plugin\n", PLUGIN_NAME); + h = malloc(sizeof(*h)); if (NULL == h) return NULL; _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
