summaryrefslogtreecommitdiff
path: root/ivi-layermanagement-api
diff options
context:
space:
mode:
authorEmre Ucan <eucan@de.adit-jv.com>2015-07-06 15:12:09 +0200
committerNobuhiko Tanibata <nobuhiko_tanibata@xddp.denso.co.jp>2015-07-08 08:56:14 +0900
commit66d21779ede2b85d8e9cd8ebc9cfe1c926ec7099 (patch)
treecc68445c2c871410f5fcecba61c392ed1612d831 /ivi-layermanagement-api
parent7ee169e73bc40afe2909c7a4916b6873cd1a2b40 (diff)
downloadwayland-ivi-extension-66d21779ede2b85d8e9cd8ebc9cfe1c926ec7099.tar.gz
ilmControl: remove ilm_layerSetDimension API
it is unnecessary. ilm_layerSetDestinationRectangle can be used instead. Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Diffstat (limited to 'ivi-layermanagement-api')
-rw-r--r--ivi-layermanagement-api/ilmControl/include/ilm_control.h11
-rw-r--r--ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c24
-rw-r--r--ivi-layermanagement-api/test/ilm_control_notification_test.cpp19
3 files changed, 0 insertions, 54 deletions
diff --git a/ivi-layermanagement-api/ilmControl/include/ilm_control.h b/ivi-layermanagement-api/ilmControl/include/ilm_control.h
index b309d0f..35bcf72 100644
--- a/ivi-layermanagement-api/ilmControl/include/ilm_control.h
+++ b/ivi-layermanagement-api/ilmControl/include/ilm_control.h
@@ -241,17 +241,6 @@ ilmErrorTypes ilm_layerSetSourceRectangle(t_ilm_layer layerId, t_ilm_uint x, t_i
ilmErrorTypes ilm_layerSetDestinationRectangle(t_ilm_layer layerId, t_ilm_int x, t_ilm_int y, t_ilm_int width, t_ilm_int height);
/**
- * \brief Set the horizontal and vertical dimension of the layer.
- * \ingroup ilmControl
- * \param[in] layerId Id of layer.
- * \param[in] pDimension pointer to an array where the dimension is stored.
- * dimension[0]=width, dimension[1]=height
- * \return ILM_SUCCESS if the method call was successful
- * \return ILM_FAILED if the client can not call the method on the service.
- */
-ilmErrorTypes ilm_layerSetDimension(t_ilm_layer layerId, t_ilm_uint *pDimension);
-
-/**
* \brief Get the horizontal and vertical position of the layer.
* \ingroup ilmControl
* \param[in] layerId Id of layer.
diff --git a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
index e79b54e..f91e873 100644
--- a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
+++ b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
@@ -1933,30 +1933,6 @@ ilm_layerSetDestinationRectangle(t_ilm_layer layerId,
}
ILM_EXPORT ilmErrorTypes
-ilm_layerSetDimension(t_ilm_layer layerId, t_ilm_uint *pDimension)
-{
- ilmErrorTypes returnValue = ILM_FAILED;
- struct ilm_control_context *ctx = sync_and_acquire_instance();
- struct layer_context *ctx_layer = NULL;
-
- if (pDimension != NULL) {
- ctx_layer = (struct layer_context*)
- wayland_controller_get_layer_context(
- &ctx->wl, (uint32_t)layerId);
- if (ctx_layer != NULL) {
- ivi_controller_layer_set_destination_rectangle(
- ctx_layer->controller,
- ctx_layer->prop.destX, ctx_layer->prop.destY,
- (int32_t)*pDimension, (int32_t)*(pDimension + 1));
- returnValue = ILM_SUCCESS;
- }
- }
-
- release_instance();
- return returnValue;
-}
-
-ILM_EXPORT ilmErrorTypes
ilm_layerGetPosition(t_ilm_layer layerId, t_ilm_uint *pPosition)
{
ilmErrorTypes returnValue = ILM_FAILED;
diff --git a/ivi-layermanagement-api/test/ilm_control_notification_test.cpp b/ivi-layermanagement-api/test/ilm_control_notification_test.cpp
index 92a36ca..da7ebc8 100644
--- a/ivi-layermanagement-api/test/ilm_control_notification_test.cpp
+++ b/ivi-layermanagement-api/test/ilm_control_notification_test.cpp
@@ -315,25 +315,6 @@ TEST_F(NotificationTest, NotifyOnLayerSetPosition)
ASSERT_EQ(ILM_SUCCESS,ilm_layerRemoveNotification(layer));
}
-TEST_F(NotificationTest, NotifyOnLayerSetDimension)
-{
- ASSERT_EQ(ILM_SUCCESS,ilm_layerAddNotification(layer,&LayerCallbackFunction));
- // change something
- t_ilm_uint pos[] = { 70, 22 };
- ilm_layerSetDimension(layer,pos);
- ilm_commitChanges();
-
- // expect callback to have been called
- assertCallbackcalled();
-
- EXPECT_EQ(layer,callbackLayerId);
- EXPECT_EQ(70u,LayerProperties.destWidth);
- EXPECT_EQ(22u,LayerProperties.destHeight);
- EXPECT_EQ(ILM_NOTIFICATION_DEST_RECT,mask);
-
- ASSERT_EQ(ILM_SUCCESS,ilm_layerRemoveNotification(layer));
-}
-
TEST_F(NotificationTest, NotifyOnLayerSetDestinationRectangle)
{
ASSERT_EQ(ILM_SUCCESS,ilm_layerAddNotification(layer,&LayerCallbackFunction));