[media-ctl PATCH v2 3/4] Drop _ACTUAL from selection target names

[Sakari Ailus]

Signed-off-by: Sakari Ailus <sakari.ai...@iki.fi>
---
 src/main.c       |    4 ++--
 src/v4l2subdev.c |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main.c b/src/main.c
index a989669..703f034 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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 d7e6d8d..48b7acb 100644
--- a/src/v4l2subdev.c
+++ b/src/v4l2subdev.c
@@ -128,7 +128,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));
@@ -168,7 +168,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));
@@ -514,11 +514,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;
 
-- 
1.7.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html