diff options
author | Emre Ucan <eucan@de.adit-jv.com> | 2015-07-01 09:53:31 +0200 |
---|---|---|
committer | Nobuhiko Tanibata <nobuhiko_tanibata@xddp.denso.co.jp> | 2015-07-06 18:41:03 +0900 |
commit | 191420070caca8deba766c27444bad8586cf8287 (patch) | |
tree | 2f278c9f7e2d2ba810b5d7489d28c8515883d7a6 /ivi-layermanagement-api | |
parent | 0956a3dafd1b09785304034c39bd1fa03f3ba071 (diff) | |
download | wayland-ivi-extension-191420070caca8deba766c27444bad8586cf8287.tar.gz |
ilmClient: remove ilm_surfaceRemoveNativeContent API
it is never implemented for wayland-ivi-extension, and it is decided that it is not required.
Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Diffstat (limited to 'ivi-layermanagement-api')
4 files changed, 0 insertions, 30 deletions
diff --git a/ivi-layermanagement-api/ilmClient/include/ilm_client.h b/ivi-layermanagement-api/ilmClient/include/ilm_client.h index b6be5ee..2f7f7d3 100644 --- a/ivi-layermanagement-api/ilmClient/include/ilm_client.h +++ b/ivi-layermanagement-api/ilmClient/include/ilm_client.h @@ -80,15 +80,6 @@ ilmErrorTypes ilm_surfaceGetDimension(t_ilm_surface surfaceId, t_ilm_uint *pDime ilmErrorTypes ilm_surfaceRemove(const t_ilm_surface surfaceId); /** - * \brief Remove the native content of a surface - * \ingroup ilmClient - * \param[in] surfaceId The ID of the surface - * \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_surfaceRemoveNativeContent(t_ilm_surface surfaceId); - -/** * \brief Set the native content of an application to be used as surface content * \ingroup ilmClient * \param[in] nativehandle The native windowsystem's handle for the surface diff --git a/ivi-layermanagement-api/ilmClient/include/ilm_client_platform.h b/ivi-layermanagement-api/ilmClient/include/ilm_client_platform.h index e332b98..c567735 100644 --- a/ivi-layermanagement-api/ilmClient/include/ilm_client_platform.h +++ b/ivi-layermanagement-api/ilmClient/include/ilm_client_platform.h @@ -33,7 +33,6 @@ typedef struct _ILM_CLIENT_PLATFORM_FUNC t_ilm_int width, t_ilm_int height, ilmPixelFormat pixelFormat, t_ilm_surface* pSurfaceId); ilmErrorTypes (*surfaceRemove)(const t_ilm_surface surfaceId); - ilmErrorTypes (*surfaceRemoveNativeContent)(t_ilm_surface surfaceId); ilmErrorTypes (*surfaceSetNativeContent)(t_ilm_nativehandle nativehandle, t_ilm_int width, t_ilm_int height, ilmPixelFormat pixelFormat, t_ilm_surface surfaceId); diff --git a/ivi-layermanagement-api/ilmClient/src/ilm_client.c b/ivi-layermanagement-api/ilmClient/src/ilm_client.c index 7c1215f..a36161b 100644 --- a/ivi-layermanagement-api/ilmClient/src/ilm_client.c +++ b/ivi-layermanagement-api/ilmClient/src/ilm_client.c @@ -72,12 +72,6 @@ ilm_surfaceRemove(t_ilm_surface surfaceId) } ILM_EXPORT ilmErrorTypes -ilm_surfaceRemoveNativeContent(t_ilm_surface surfaceId) -{ - return gIlmClientPlatformFunc.surfaceRemoveNativeContent(surfaceId); -} - -ILM_EXPORT ilmErrorTypes ilm_surfaceSetNativeContent(t_ilm_nativehandle nativehandle, t_ilm_int width, t_ilm_int height, ilmPixelFormat pixelFormat, diff --git a/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c b/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c index 1cb018f..3eb6300 100644 --- a/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c +++ b/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c @@ -34,8 +34,6 @@ static ilmErrorTypes wayland_surfaceCreate(t_ilm_nativehandle nativehandle, ilmPixelFormat pixelFormat, t_ilm_surface* pSurfaceId); static ilmErrorTypes wayland_surfaceRemove(const t_ilm_surface surfaceId); -static ilmErrorTypes wayland_surfaceRemoveNativeContent( - t_ilm_surface surfaceId); static ilmErrorTypes wayland_surfaceSetNativeContent( t_ilm_nativehandle nativehandle, t_ilm_int width, t_ilm_int height, @@ -53,8 +51,6 @@ void init_ilmClientPlatformTable(void) wayland_surfaceCreate; gIlmClientPlatformFunc.surfaceRemove = wayland_surfaceRemove; - gIlmClientPlatformFunc.surfaceRemoveNativeContent = - wayland_surfaceRemoveNativeContent; gIlmClientPlatformFunc.surfaceSetNativeContent = wayland_surfaceSetNativeContent; gIlmClientPlatformFunc.init = @@ -546,16 +542,6 @@ wayland_surfaceRemove(t_ilm_surface surfaceId) } static ilmErrorTypes -wayland_surfaceRemoveNativeContent(t_ilm_surface surfaceId) -{ - (void)surfaceId; - - /* There is no API to set native content - as such ivi_surface_set_native. */ - return ILM_FAILED; -} - -static ilmErrorTypes wayland_surfaceSetNativeContent(t_ilm_nativehandle nativehandle, t_ilm_int width, t_ilm_int height, |