This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/v4l-utils.git tree:
Subject: v4l2-ctl: add support for integer menus. Author: Hans Verkuil <[email protected]> Date: Thu Apr 19 16:28:05 2012 +0200 Signed-off-by: Hans Verkuil <[email protected]> utils/v4l2-ctl/v4l2-ctl.cpp | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=f330d3cf0a3c5a2a9d4b43bcdf1e8cca49820615 diff --git a/utils/v4l2-ctl/v4l2-ctl.cpp b/utils/v4l2-ctl/v4l2-ctl.cpp index 84e0f33..386a2be 100644 --- a/utils/v4l2-ctl/v4l2-ctl.cpp +++ b/utils/v4l2-ctl/v4l2-ctl.cpp @@ -915,6 +915,12 @@ static void print_qctrl(int fd, struct v4l2_queryctrl *queryctrl, queryctrl->minimum, queryctrl->maximum, queryctrl->default_value, ctrl->value); break; + case V4L2_CTRL_TYPE_INTEGER_MENU: + printf("%31s (intmenu): min=%d max=%d default=%d value=%d", + s.c_str(), + queryctrl->minimum, queryctrl->maximum, + queryctrl->default_value, ctrl->value); + break; case V4L2_CTRL_TYPE_BUTTON: printf("%31s (button) :", s.c_str()); break; @@ -928,12 +934,16 @@ static void print_qctrl(int fd, struct v4l2_queryctrl *queryctrl, if (queryctrl->flags) printf(" flags=%s", ctrlflags2s(queryctrl->flags).c_str()); printf("\n"); - if (queryctrl->type == V4L2_CTRL_TYPE_MENU && show_menus) { + if ((queryctrl->type == V4L2_CTRL_TYPE_MENU || + queryctrl->type == V4L2_CTRL_TYPE_INTEGER_MENU) && show_menus) { for (i = queryctrl->minimum; i <= queryctrl->maximum; i++) { qmenu.index = i; if (test_ioctl(fd, VIDIOC_QUERYMENU, &qmenu)) continue; - printf("\t\t\t\t%d: %s\n", i, qmenu.name); + if (queryctrl->type == V4L2_CTRL_TYPE_MENU) + printf("\t\t\t\t%d: %s\n", i, qmenu.name); + else + printf("\t\t\t\t%d: %lld (0x%llx)\n", i, qmenu.value, qmenu.value); } } } _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
