summaryrefslogtreecommitdiff
path: root/ivi-layermanagement-api
diff options
context:
space:
mode:
authorEmre Ucan <eucan@de.adit-jv.com>2015-07-06 15:20:52 +0200
committerNobuhiko Tanibata <nobuhiko_tanibata@xddp.denso.co.jp>2015-07-08 08:56:14 +0900
commit22f1d415580d99496817caabe7e17c62cb15ed26 (patch)
tree2387d733f6ad7b1491bab20ea20eea00205fd269 /ivi-layermanagement-api
parentcc5678b5c1b1aeb33f09d6138a15860d59c76497 (diff)
downloadwayland-ivi-extension-22f1d415580d99496817caabe7e17c62cb15ed26.tar.gz
ilmControl,tests: remove ilm_layerGetPosition
it is a unnecessary API. ilm_getLayerOfProperties 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.c22
-rw-r--r--ivi-layermanagement-api/test/ilm_control_test.cpp22
3 files changed, 0 insertions, 55 deletions
diff --git a/ivi-layermanagement-api/ilmControl/include/ilm_control.h b/ivi-layermanagement-api/ilmControl/include/ilm_control.h
index 1d1f0bf..c73515f 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 Get the horizontal and vertical position of the layer.
- * \ingroup ilmControl
- * \param[in] layerId Id of layer.
- * \param[out] pPosition pointer to an array where the position should be 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_layerGetPosition(t_ilm_layer layerId, t_ilm_uint *pPosition);
-
-/**
* \brief Sets 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 ccc3b1b..71895c5 100644
--- a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
+++ b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
@@ -1933,28 +1933,6 @@ ilm_layerSetDestinationRectangle(t_ilm_layer layerId,
}
ILM_EXPORT ilmErrorTypes
-ilm_layerGetPosition(t_ilm_layer layerId, t_ilm_uint *pPosition)
-{
- ilmErrorTypes returnValue = ILM_FAILED;
- struct ilm_control_context *ctx = sync_and_acquire_instance();
- struct layer_context *ctx_layer = NULL;
-
- if (pPosition != NULL) {
- ctx_layer = (struct layer_context*)
- wayland_controller_get_layer_context(
- &ctx->wl, (uint32_t)layerId);
- if (ctx_layer != NULL) {
- *pPosition = ctx_layer->prop.destX;
- *(pPosition + 1) = ctx_layer->prop.destY;
- returnValue = ILM_SUCCESS;
- }
- }
-
- release_instance();
- return returnValue;
-}
-
-ILM_EXPORT ilmErrorTypes
ilm_layerSetPosition(t_ilm_layer layerId, t_ilm_uint *pPosition)
{
ilmErrorTypes returnValue = ILM_FAILED;
diff --git a/ivi-layermanagement-api/test/ilm_control_test.cpp b/ivi-layermanagement-api/test/ilm_control_test.cpp
index 85f8311..8753a7d 100644
--- a/ivi-layermanagement-api/test/ilm_control_test.cpp
+++ b/ivi-layermanagement-api/test/ilm_control_test.cpp
@@ -73,28 +73,6 @@ public:
}
};
-TEST_F(IlmCommandTest, SetGetLayerPosition) {
- uint layer = 4316;
-
- ASSERT_EQ(ILM_SUCCESS, ilm_layerCreateWithDimension(&layer, 800, 480));
-
- t_ilm_uint pos[2] = {115, 125};
- ASSERT_EQ(ILM_SUCCESS, ilm_layerSetPosition(layer, pos));
- ASSERT_EQ(ILM_SUCCESS, ilm_commitChanges());
-
- t_ilm_uint posreturned[2];
- ASSERT_EQ(ILM_SUCCESS, ilm_layerGetPosition(layer, posreturned));
- ASSERT_EQ(pos[0], posreturned[0]);
- ASSERT_EQ(pos[1], posreturned[1]);
-}
-
-TEST_F(IlmCommandTest, SetGetLayerPosition_InvalidInput) {
- uint layer = 0xdeadbeef;
- t_ilm_uint pos[2] = {15, 25};
- ASSERT_NE(ILM_SUCCESS, ilm_layerSetPosition(layer, pos));
- ASSERT_NE(ILM_SUCCESS, ilm_layerGetPosition(layer, pos));
-}
-
TEST_F(IlmCommandTest, SetGetSurfaceOrientation) {
uint surface = 36;
ilmOrientation returned;