ivi-shell: remove ivi_layout_layer_get_position API

Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Acked-by: wataru_natsume <wataru_natsume@xddp.denso.co.jp>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>

5 files changed, 10 insertions, 35 deletions

diff --git a/ivi-shell/hmi-controller.c b/ivi-shell/hmi-controller.c
index 6548ed7e..4daf7d2c 100644
--- a/ivi-shell/hmi-controller.c
+++ b/ivi-shell/hmi-controller.c
@@ -1417,6 +1417,7 @@ move_workspace_grab_end(struct move_grab *move, struct wl_resource* resource,
 {
 	struct hmi_controller *hmi_ctrl = wl_resource_get_user_data(resource);
 	int32_t width = hmi_ctrl->workspace_background_layer.width;
+	const struct ivi_layout_layer_properties *prop;
 
 	struct timespec time = {0};
 	double grab_time = 0.0;
@@ -1443,8 +1444,9 @@ move_workspace_grab_end(struct move_grab *move, struct wl_resource* resource,
 	if (200 < from_motion_time)
 		pointer_v = 0.0;
 
-	ivi_layout_interface->layer_get_position(layer, &pos_x, &pos_y);
-
+	prop = ivi_layout_interface->get_properties_of_layer(layer);
+	pos_x = prop->dest_x;
+	pos_y = prop->dest_y;
 
 	if (is_flick) {
 		int orgx = wl_fixed_to_int(move->dst[0] + grab_x);
@@ -1733,6 +1735,7 @@ move_grab_init_workspace(struct move_grab* move,
 {
 	struct hmi_controller *hmi_ctrl = wl_resource_get_user_data(resource);
 	struct ivi_layout_layer *layer = hmi_ctrl->workspace_layer.ivilayer;
+	const struct ivi_layout_layer_properties *prop;
 	int32_t workspace_count = hmi_ctrl->workspace_count;
 	int32_t workspace_width = hmi_ctrl->workspace_background_layer.width;
 	int32_t layer_pos_x = 0;
@@ -1741,7 +1744,9 @@ move_grab_init_workspace(struct move_grab* move,
 	wl_fixed_t rgn[2][2] = {{0}};
 	wl_fixed_t grab_pos[2] = { grab_x, grab_y };
 
-	ivi_layout_interface->layer_get_position(layer, &layer_pos_x, &layer_pos_y);
+	prop = ivi_layout_interface->get_properties_of_layer(layer);
+	layer_pos_x = prop->dest_x;
+	layer_pos_y = prop->dest_y;
 
 	start_pos[0] = wl_fixed_from_int(layer_pos_x);
 	start_pos[1] = wl_fixed_from_int(layer_pos_y);
diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h
index 4dbac50d..6428ef01 100644
--- a/ivi-shell/ivi-layout-export.h
+++ b/ivi-shell/ivi-layout-export.h
@@ -555,15 +555,6 @@ struct ivi_layout_interface {
 				      int32_t dest_x, int32_t dest_y);
 
 	/**
-	 * \brief Get the horizontal and vertical position of the ivi_layer.
-	 *
-	 * \return IVI_SUCCEEDED if the method call was successful
-	 * \return IVI_FAILED if the method call was failed
-	 */
-	int32_t (*layer_get_position)(struct ivi_layout_layer *ivilayer,
-				      int32_t *dest_x, int32_t *dest_y);
-
-	/**
 	 * \brief Set the horizontal and vertical dimension of the layer.
 	 *
 	 * \return IVI_SUCCEEDED if the method call was successful
diff --git a/ivi-shell/ivi-layout-private.h b/ivi-shell/ivi-layout-private.h
index 9f0ca798..913bb0cb 100644
--- a/ivi-shell/ivi-layout-private.h
+++ b/ivi-shell/ivi-layout-private.h
@@ -206,9 +206,6 @@ int32_t
 ivi_layout_layer_set_position(struct ivi_layout_layer *ivilayer,
 			      int32_t dest_x, int32_t dest_y);
 int32_t
-ivi_layout_layer_get_position(struct ivi_layout_layer *ivilayer,
-			      int32_t *dest_x, int32_t *dest_y);
-int32_t
 ivi_layout_layer_set_render_order(struct ivi_layout_layer *ivilayer,
 				  struct ivi_layout_surface **pSurface,
 				  int32_t number);
diff --git a/ivi-shell/ivi-layout-transition.c b/ivi-shell/ivi-layout-transition.c
index 529bd562..df6112d2 100644
--- a/ivi-shell/ivi-layout-transition.c
+++ b/ivi-shell/ivi-layout-transition.c
@@ -736,12 +736,10 @@ ivi_layout_transition_move_layer(struct ivi_layout_layer *layer,
 				 int32_t dest_x, int32_t dest_y,
 				 uint32_t duration)
 {
-	int32_t start_pos_x = 0;
-	int32_t start_pos_y = 0;
+	int32_t start_pos_x = layer->prop.dest_x;
+	int32_t start_pos_y = layer->prop.dest_y;
 	struct ivi_layout_transition *transition = NULL;
 
-	ivi_layout_layer_get_position(layer, &start_pos_x, &start_pos_y);
-
 	transition = create_move_layer_transition(
 		layer,
 		start_pos_x, start_pos_y,
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index c6ae09f0..563b486f 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -1907,21 +1907,6 @@ ivi_layout_layer_set_dimension(struct ivi_layout_layer *ivilayer,
 }
 
 int32_t
-ivi_layout_layer_get_position(struct ivi_layout_layer *ivilayer,
-			      int32_t *dest_x, int32_t *dest_y)
-{
-	if (ivilayer == NULL || dest_x == NULL || dest_y == NULL) {
-		weston_log("ivi_layout_layer_get_position: invalid argument\n");
-		return IVI_FAILED;
-	}
-
-	*dest_x = ivilayer->prop.dest_x;
-	*dest_y = ivilayer->prop.dest_y;
-
-	return IVI_SUCCEEDED;
-}
-
-int32_t
 ivi_layout_layer_set_position(struct ivi_layout_layer *ivilayer,
 			      int32_t dest_x, int32_t dest_y)
 {
@@ -2721,7 +2706,6 @@ static struct ivi_layout_interface ivi_layout_interface = {
 	.layer_set_source_rectangle		= ivi_layout_layer_set_source_rectangle,
 	.layer_set_destination_rectangle	= ivi_layout_layer_set_destination_rectangle,
 	.layer_set_position			= ivi_layout_layer_set_position,
-	.layer_get_position			= ivi_layout_layer_get_position,
 	.layer_set_dimension			= ivi_layout_layer_set_dimension,
 	.layer_get_dimension			= ivi_layout_layer_get_dimension,
 	.layer_set_orientation			= ivi_layout_layer_set_orientation,