>From 72d835008c1712a8b19427e540de444482527d75 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 16 May 2010 11:17:22 +0200 Subject: [PATCH 01/10] Support mapping button controls --- libwebcam/dynctrl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libwebcam/dynctrl.c b/libwebcam/dynctrl.c index 229bdc4..78e67ff 100644 --- a/libwebcam/dynctrl.c +++ b/libwebcam/dynctrl.c @@ -422,6 +422,9 @@ static enum v4l2_ctrl_type get_v4l2_ctrl_type_by_name (const xmlChar *name) else if(xmlStrEqual(name, BAD_CAST("V4L2_CTRL_TYPE_BOOLEAN"))) { type = V4L2_CTRL_TYPE_BOOLEAN; } + else if(xmlStrEqual(name, BAD_CAST("V4L2_CTRL_TYPE_BUTTON"))) { + type = V4L2_CTRL_TYPE_BUTTON; + } #ifdef ENABLE_RAW_CONTROLS else if(xmlStrEqual(name, BAD_CAST("V4L2_CTRL_TYPE_STRING"))) { type = V4L2_CTRL_TYPE_STRING; @@ -431,9 +434,6 @@ static enum v4l2_ctrl_type get_v4l2_ctrl_type_by_name (const xmlChar *name) else if(xmlStrEqual(name, BAD_CAST("V4L2_CTRL_TYPE_MENU"))) { type = V4L2_CTRL_TYPE_MENU; } - else if(xmlStrEqual(name, BAD_CAST("V4L2_CTRL_TYPE_BUTTON"))) { - type = V4L2_CTRL_TYPE_BUTTON; - } else if(xmlStrEqual(name, BAD_CAST("V4L2_CTRL_TYPE_INTEGER64"))) { type = V4L2_CTRL_TYPE_INTEGER64; } -- 1.7.10