diff options
| author | Sakari Ailus <sakari.ailus@iki.fi> | 2012-05-23 01:30:59 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-07-18 01:50:23 +0200 |
| commit | 982bbcaec5f22a56dd4b6294905d26187f8f79dd (patch) | |
| tree | ba70311da3f08edd780950f617c2865eeb17abd0 | |
| parent | 558a726f839f5a668b01321c9409a48b8ab2ea60 (diff) | |
Drop _ACTUAL from selection target names
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
| -rw-r--r-- | src/main.c | 4 | ||||
| -rw-r--r-- | src/v4l2subdev.c | 8 |
2 files changed, 6 insertions, 6 deletions
@@ -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", diff --git a/src/v4l2subdev.c b/src/v4l2subdev.c index d60bd7e..fcf3ec5 100644 --- a/src/v4l2subdev.c +++ b/src/v4l2subdev.c @@ -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; |