diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-06 22:26:49 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-06 22:26:49 -0200 |
| commit | a2277247714a35325a228e495412628fa1c42ff8 (patch) | |
| tree | 26b6c7e251fe8578c1dc20814241293bc3e79d68 /v4l2-apps/util/v4l2-ctl.cpp | |
| parent | 4ddabb0e021ea79119db35f5f848fb9220077e20 (diff) | |
| parent | aa76e2d035b686e2d6e0c84c6a80ce69147d3d87 (diff) | |
| download | mediapointer-dvb-s2-a2277247714a35325a228e495412628fa1c42ff8.tar.gz mediapointer-dvb-s2-a2277247714a35325a228e495412628fa1c42ff8.tar.bz2 | |
merge: http://linuxtv.org/hg/~endriss/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l2-apps/util/v4l2-ctl.cpp')
| -rw-r--r-- | v4l2-apps/util/v4l2-ctl.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/v4l2-apps/util/v4l2-ctl.cpp b/v4l2-apps/util/v4l2-ctl.cpp index a0b14d9fb..9229732ac 100644 --- a/v4l2-apps/util/v4l2-ctl.cpp +++ b/v4l2-apps/util/v4l2-ctl.cpp @@ -553,7 +553,8 @@ static void find_controls(int fd) int id; while (ioctl(fd, VIDIOC_QUERYCTRL, &qctrl) == 0) { - if (qctrl.type != V4L2_CTRL_TYPE_CTRL_CLASS) { + if (qctrl.type != V4L2_CTRL_TYPE_CTRL_CLASS && + !(qctrl.flags & V4L2_CTRL_FLAG_DISABLED)) { ctrl_str2id[name2var(qctrl.name)] = qctrl.id; ctrl_id2str[qctrl.id] = name2var(qctrl.name); } @@ -563,12 +564,14 @@ static void find_controls(int fd) return; for (id = V4L2_CID_USER_BASE; id < V4L2_CID_LASTP1; id++) { qctrl.id = id; - if (ioctl(fd, VIDIOC_QUERYCTRL, &qctrl) == 0) + if (ioctl(fd, VIDIOC_QUERYCTRL, &qctrl) == 0 && + !(qctrl.flags & V4L2_CTRL_FLAG_DISABLED)) ctrl_str2id[name2var(qctrl.name)] = qctrl.id; } for (qctrl.id = V4L2_CID_PRIVATE_BASE; ioctl(fd, VIDIOC_QUERYCTRL, &qctrl) == 0; qctrl.id++) { - ctrl_str2id[name2var(qctrl.name)] = qctrl.id; + if (!(qctrl.flags & V4L2_CTRL_FLAG_DISABLED)) + ctrl_str2id[name2var(qctrl.name)] = qctrl.id; } } |