EGLWLInputEventExample: remove ilmControl dependency

Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>

3 files changed, 3 insertions, 23 deletions

diff --git a/ivi-layermanagement-examples/EGLWLInputEventExample/CMakeLists.txt b/ivi-layermanagement-examples/EGLWLInputEventExample/CMakeLists.txt
index ede366e..b514831 100644
--- a/ivi-layermanagement-examples/EGLWLInputEventExample/CMakeLists.txt
+++ b/ivi-layermanagement-examples/EGLWLInputEventExample/CMakeLists.txt
@@ -29,11 +29,9 @@ pkg_check_modules(WAYLAND_EGL wayland-egl REQUIRED)
 pkg_check_modules(WAYLAND_CLIENT wayland-client REQUIRED)
 
 GET_TARGET_PROPERTY(ILM_CLIENT_INCLUDE_DIRS  ilmClient  INCLUDE_DIRECTORIES)
-GET_TARGET_PROPERTY(ILM_CONTROL_INCLUDE_DIRS ilmControl INCLUDE_DIRECTORIES)
 
 include_directories(
     ${ILM_CLIENT_INCLUDE_DIRS}
-    ${ILM_CONTROL_INCLUDE_DIRS}
     ${GLESv2_INCLUDE_DIR}
     ${EGL_INCLUDE_DIR}
     ${WAYLAND_CLIENT_INCLUDE_DIR}
@@ -76,7 +74,6 @@ add_dependencies(EGLWLInputEventExample
     wayland-client
     wayland-egl
     ilmClient
-    ilmControl
     ${LIBS}
 )
 
@@ -88,7 +85,6 @@ set(LIBS
     ${FFI_LIBRARIES}
     ${EGL_LIBRARIES}
     ilmClient
-    ilmControl
 )
 
 add_definitions(${EGL_CFLAGS})
diff --git a/ivi-layermanagement-examples/EGLWLInputEventExample/src/WLSurface.cpp b/ivi-layermanagement-examples/EGLWLInputEventExample/src/WLSurface.cpp
index 47d1311..5e627aa 100644
--- a/ivi-layermanagement-examples/EGLWLInputEventExample/src/WLSurface.cpp
+++ b/ivi-layermanagement-examples/EGLWLInputEventExample/src/WLSurface.cpp
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <assert.h>
 #include "WLSurface.h"
-#include "ilm_control.h"
 
 WLSurface::WLSurface(WLContext* wlContext)
 : m_wlContext(wlContext)
@@ -79,16 +78,6 @@ WLSurface::CreateIlmSurface(t_ilm_surface* surfaceId,
         return false;
     }
 
-    rtnv = ilm_surfaceSetDestinationRectangle(*surfaceId, 0, 0, width, height);
-    rtnv = ilm_surfaceSetSourceRectangle(*surfaceId, 0, 0, width, height);
-    rtnv = ilm_surfaceSetVisibility(*surfaceId, ILM_TRUE);
-    rtnv = ilm_surfaceSetOpacity(*surfaceId, 1.0f);
-
-    /* TODO: Set input acceptance using new API */
-    /* TODO: Set keyboard focus using new API */
-
-    rtnv = ilm_commitChanges();
-
     m_ilmSurfaceId = *surfaceId;
 
     return true;
@@ -98,9 +87,6 @@ void
 WLSurface::DestroyIlmSurface()
 {
     if (m_ilmSurfaceId > 0){
-        /* TODO: Set input acceptance using new API */
-	/* TODO: Set input focus using the new API */
-        ilm_commitChanges();
         ilm_surfaceRemove(m_ilmSurfaceId);
     }
 }
diff --git a/ivi-layermanagement-examples/EGLWLInputEventExample/src/main.cpp b/ivi-layermanagement-examples/EGLWLInputEventExample/src/main.cpp
index 9976e69..f1b29a1 100644
--- a/ivi-layermanagement-examples/EGLWLInputEventExample/src/main.cpp
+++ b/ivi-layermanagement-examples/EGLWLInputEventExample/src/main.cpp
@@ -79,7 +79,7 @@ int main(int argc, char **argv)
     wlContext = new WLContext();
     wlContext->InitWLContext(&PointerListener, &KeyboardListener, &TouchListener);
 
-    ilm_initWithNativedisplay((t_ilm_nativedisplay)wlContext->GetWLDisplay());
+    ilmClient_init((t_ilm_nativedisplay)wlContext->GetWLDisplay());
 
     eglSurface = new WLEGLSurface(wlContext);
     eglSurface->CreateSurface(400, 240);
@@ -110,12 +110,10 @@ int main(int argc, char **argv)
 
     TerminateRenderer();
     ilm_surfaceRemove(surfaceId);
-    /* TODO: Update input acceptance to new API */
-    ilm_commitChanges();
+
     eglSurface->DestroyIlmSurface();
-    ilm_commitChanges();
 
-    ilm_destroy();
+    ilmClient_destroy();
     delete eyes;
     delete eglSurface;
     delete wlContext;