From 345e356ee0816ea5d1477e6908191d119767c8f7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?B=C3=A5rd=20Eirik=20Winther?= Date: Tue, 30 Jul 2013 10:15:19 +0200 Subject: [PATCH] qv4l2: move function ctrlEvent MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Moved the ctrlEvent() function in qv4l2.cpp to be grouped with GUI function and to group capFrame() and capVbiFrame() together. Signed-off-by: BÃ¥rd Eirik Winther Signed-off-by: Hans Verkuil --- utils/qv4l2/qv4l2.cpp | 94 +++++++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/utils/qv4l2/qv4l2.cpp b/utils/qv4l2/qv4l2.cpp index de9b154..a8fcc65 100644 --- a/utils/qv4l2/qv4l2.cpp +++ b/utils/qv4l2/qv4l2.cpp @@ -202,6 +202,53 @@ void ApplicationWindow::openrawdev() setDevice(d.selectedFiles().first(), true); } +void ApplicationWindow::ctrlEvent() +{ + v4l2_event ev; + + while (dqevent(ev)) { + if (ev.type != V4L2_EVENT_CTRL) + continue; + m_ctrlMap[ev.id].flags = ev.u.ctrl.flags; + m_ctrlMap[ev.id].minimum = ev.u.ctrl.minimum; + m_ctrlMap[ev.id].maximum = ev.u.ctrl.maximum; + m_ctrlMap[ev.id].step = ev.u.ctrl.step; + m_ctrlMap[ev.id].default_value = ev.u.ctrl.default_value; + m_widgetMap[ev.id]->setDisabled(m_ctrlMap[ev.id].flags & CTRL_FLAG_DISABLED); + switch (m_ctrlMap[ev.id].type) { + case V4L2_CTRL_TYPE_INTEGER: + case V4L2_CTRL_TYPE_INTEGER_MENU: + case V4L2_CTRL_TYPE_MENU: + case V4L2_CTRL_TYPE_BOOLEAN: + case V4L2_CTRL_TYPE_BITMASK: + setVal(ev.id, ev.u.ctrl.value); + break; + case V4L2_CTRL_TYPE_INTEGER64: + setVal64(ev.id, ev.u.ctrl.value64); + break; + default: + break; + } + if (m_ctrlMap[ev.id].type != V4L2_CTRL_TYPE_STRING) + continue; + queryctrl(m_ctrlMap[ev.id]); + + struct v4l2_ext_control c; + struct v4l2_ext_controls ctrls; + + c.id = ev.id; + c.size = m_ctrlMap[ev.id].maximum + 1; + c.string = (char *)malloc(c.size); + memset(&ctrls, 0, sizeof(ctrls)); + ctrls.count = 1; + ctrls.ctrl_class = 0; + ctrls.controls = &c; + if (!ioctl(VIDIOC_G_EXT_CTRLS, &ctrls)) + setString(ev.id, c.string); + free(c.string); + } +} + void ApplicationWindow::capVbiFrame() { __u32 buftype = m_genTab->bufType(); @@ -305,53 +352,6 @@ void ApplicationWindow::capVbiFrame() refresh(); } -void ApplicationWindow::ctrlEvent() -{ - v4l2_event ev; - - while (dqevent(ev)) { - if (ev.type != V4L2_EVENT_CTRL) - continue; - m_ctrlMap[ev.id].flags = ev.u.ctrl.flags; - m_ctrlMap[ev.id].minimum = ev.u.ctrl.minimum; - m_ctrlMap[ev.id].maximum = ev.u.ctrl.maximum; - m_ctrlMap[ev.id].step = ev.u.ctrl.step; - m_ctrlMap[ev.id].default_value = ev.u.ctrl.default_value; - m_widgetMap[ev.id]->setDisabled(m_ctrlMap[ev.id].flags & CTRL_FLAG_DISABLED); - switch (m_ctrlMap[ev.id].type) { - case V4L2_CTRL_TYPE_INTEGER: - case V4L2_CTRL_TYPE_INTEGER_MENU: - case V4L2_CTRL_TYPE_MENU: - case V4L2_CTRL_TYPE_BOOLEAN: - case V4L2_CTRL_TYPE_BITMASK: - setVal(ev.id, ev.u.ctrl.value); - break; - case V4L2_CTRL_TYPE_INTEGER64: - setVal64(ev.id, ev.u.ctrl.value64); - break; - default: - break; - } - if (m_ctrlMap[ev.id].type != V4L2_CTRL_TYPE_STRING) - continue; - queryctrl(m_ctrlMap[ev.id]); - - struct v4l2_ext_control c; - struct v4l2_ext_controls ctrls; - - c.id = ev.id; - c.size = m_ctrlMap[ev.id].maximum + 1; - c.string = (char *)malloc(c.size); - memset(&ctrls, 0, sizeof(ctrls)); - ctrls.count = 1; - ctrls.ctrl_class = 0; - ctrls.controls = &c; - if (!ioctl(VIDIOC_G_EXT_CTRLS, &ctrls)) - setString(ev.id, c.string); - free(c.string); - } -} - void ApplicationWindow::capFrame() { __u32 buftype = m_genTab->bufType(); -- 2.7.4