Drop _ACTUAL from selection target names
authorSakari Ailus <sakari.ailus@iki.fi>
Tue, 22 May 2012 22:30:59 +0000 (01:30 +0300)
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Tue, 17 Jul 2012 23:50:23 +0000 (01:50 +0200)
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
src/main.c
src/v4l2subdev.c

index d10094b..dad5a9d 100644 (file)
@@ -71,7 +71,7 @@ static void v4l2_subdev_print_format(struct media_entity *entity,
                       rect.width, rect.height);
 
        ret = v4l2_subdev_get_selection(entity, &rect, pad,
-                                       V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL,
+                                       V4L2_SUBDEV_SEL_TGT_CROP,
                                        which);
        if (ret == 0)
                printf("\n\t\t crop:(%u,%u)/%ux%u", rect.left, rect.top,
@@ -85,7 +85,7 @@ static void v4l2_subdev_print_format(struct media_entity *entity,
                       rect.left, rect.top, rect.width, rect.height);
 
        ret = v4l2_subdev_get_selection(entity, &rect, pad,
-                                       V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL,
+                                       V4L2_SUBDEV_SEL_TGT_COMPOSE,
                                        which);
        if (ret == 0)
                printf("\n\t\t compose:(%u,%u)/%ux%u",
index d60bd7e..fcf3ec5 100644 (file)
@@ -129,7 +129,7 @@ int v4l2_subdev_get_selection(struct media_entity *entity,
                *rect = u.sel.r;
                return 0;
        }
-       if (errno != ENOTTY || target != V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL)
+       if (errno != ENOTTY || target != V4L2_SUBDEV_SEL_TGT_CROP)
                return -errno;
 
        memset(&u.crop, 0, sizeof(u.crop));
@@ -169,7 +169,7 @@ int v4l2_subdev_set_selection(struct media_entity *entity,
                *rect = u.sel.r;
                return 0;
        }
-       if (errno != ENOTTY || target != V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL)
+       if (errno != ENOTTY || target != V4L2_SUBDEV_SEL_TGT_CROP)
                return -errno;
 
        memset(&u.crop, 0, sizeof(u.crop));
@@ -519,11 +519,11 @@ static int v4l2_subdev_parse_setup_format(struct media_device *media,
                        return ret;
        }
 
-       ret = set_selection(pad, V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL, &crop);
+       ret = set_selection(pad, V4L2_SUBDEV_SEL_TGT_CROP, &crop);
        if (ret < 0)
                return ret;
 
-       ret = set_selection(pad, V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL, &compose);
+       ret = set_selection(pad, V4L2_SUBDEV_SEL_TGT_COMPOSE, &compose);
        if (ret < 0)
                return ret;