diff options
author | Sakari Ailus <sakari.ailus@iki.fi> | 2011-08-04 12:51:11 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-04-10 13:49:44 -0400 |
commit | ce580fe5190dec4d872e7925946b0aec1f694370 (patch) | |
tree | cb745116ea3f1fb4f8cb327810b43b140fcb8fb8 /include/media | |
parent | 3fd7e4341e04f80e2605f56bbd8cb1e8b027901a (diff) |
[media] v4l: Introduce integer menu controls
Create a new control type called V4L2_CTRL_TYPE_INTEGER_MENU. Integer menu
controls are just like menu controls but the menu items are 64-bit integers
rather than strings.
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/v4l2-ctrls.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h index 3dbd06638506..533315bd74e0 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h | |||
@@ -130,7 +130,10 @@ struct v4l2_ctrl { | |||
130 | u32 step; | 130 | u32 step; |
131 | u32 menu_skip_mask; | 131 | u32 menu_skip_mask; |
132 | }; | 132 | }; |
133 | const char * const *qmenu; | 133 | union { |
134 | const char * const *qmenu; | ||
135 | const s64 *qmenu_int; | ||
136 | }; | ||
134 | unsigned long flags; | 137 | unsigned long flags; |
135 | union { | 138 | union { |
136 | s32 val; | 139 | s32 val; |
@@ -220,6 +223,7 @@ struct v4l2_ctrl_config { | |||
220 | u32 flags; | 223 | u32 flags; |
221 | u32 menu_skip_mask; | 224 | u32 menu_skip_mask; |
222 | const char * const *qmenu; | 225 | const char * const *qmenu; |
226 | const s64 *qmenu_int; | ||
223 | unsigned int is_private:1; | 227 | unsigned int is_private:1; |
224 | }; | 228 | }; |
225 | 229 | ||