EGLWLMockNavigation: remove ilmControl dependency

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

4 files changed, 3 insertions, 25 deletions

diff --git a/ivi-layermanagement-examples/EGLWLMockNavigation/CMakeLists.txt b/ivi-layermanagement-examples/EGLWLMockNavigation/CMakeLists.txt
index 6d23fc4..cb71730 100644
--- a/ivi-layermanagement-examples/EGLWLMockNavigation/CMakeLists.txt
+++ b/ivi-layermanagement-examples/EGLWLMockNavigation/CMakeLists.txt
@@ -29,12 +29,10 @@ 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(
     include
     ${ILM_CLIENT_INCLUDE_DIRS}
-    ${ILM_CONTROL_INCLUDE_DIRS}
     ${GLESv2_INCLUDE_DIRS}
     ${EGL_INCLUDE_DIRS}
     ${WAYLAND_CLIENT_INCLUDE_DIRS}
@@ -91,7 +89,6 @@ set(LIBS
     ${WAYLAND_EGL_LIBRARIES}
     ${EGL_LIBRARIES}
     ilmClient
-    ilmControl
 )
 
 add_dependencies(${PROJECT_NAME}
diff --git a/ivi-layermanagement-examples/EGLWLMockNavigation/include/OpenGLES2App.h b/ivi-layermanagement-examples/EGLWLMockNavigation/include/OpenGLES2App.h
index fbc69a6..7e3b073 100644
--- a/ivi-layermanagement-examples/EGLWLMockNavigation/include/OpenGLES2App.h
+++ b/ivi-layermanagement-examples/EGLWLMockNavigation/include/OpenGLES2App.h
@@ -32,7 +32,6 @@ struct SurfaceConfiguration
     unsigned int surfaceId;
     unsigned int surfaceWidth;
     unsigned int surfaceHeight;
-    float opacity;
     bool nosky;
 };
 
diff --git a/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp b/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp
index 3aec32c..2e65864 100644
--- a/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp
+++ b/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp
@@ -21,7 +21,6 @@
 #include "LayerScene.h"
 #include <ilm_common.h>
 #include <ilm_client.h>
-#include <ilm_control.h>
 
 #include <iostream>
 using std::cout;
@@ -127,7 +126,7 @@ OpenGLES2App::OpenGLES2App(float fps, float animationSpeed, SurfaceConfiguration
     createWLContext(config);
     createEGLContext();
 
-    ilm_initWithNativedisplay((t_ilm_nativedisplay)m_wlContextStruct.wlDisplay);
+    ilmClient_init((t_ilm_nativedisplay)m_wlContextStruct.wlDisplay);
     setupLayerMangement(config);
 
     if (config->nosky)
@@ -152,7 +151,7 @@ OpenGLES2App::~OpenGLES2App()
     destroyWLContext();
 
     ilm_surfaceRemove(m_surfaceId);
-    ilm_destroy();
+    ilmClient_destroy();
 }
 
 void OpenGLES2App::mainloop()
@@ -326,7 +325,6 @@ ilmErrorTypes OpenGLES2App::setupLayerMangement(SurfaceConfiguration* config)
     t_ilm_surface surfaceid = (t_ilm_surface)config->surfaceId;//SURFACE_EXAMPLE_EGLX11_APPLICATION;
     int width = config->surfaceWidth;
     int height = config->surfaceHeight;
-    float opacity = config->opacity;
 
     if (config->nosky)
     {
@@ -340,19 +338,6 @@ ilmErrorTypes OpenGLES2App::setupLayerMangement(SurfaceConfiguration* config)
     ilm_surfaceCreate((t_ilm_nativehandle)m_wlContextStruct.wlSurface, width, height,
             ILM_PIXELFORMAT_RGBA_8888, &surfaceid);
 
-    cout << "set surface " << surfaceid << " src region " << 0 << ", " << 0 << ", " << width << ", " << height << "\n";
-    error = ilm_surfaceSetSourceRectangle(surfaceid, 0, 0, width, height);
-    ilm_surfaceSetDestinationRectangle(surfaceid, 0, 0, width, height);
-
-    cout << "Set surface " << surfaceid << " visible\n";
-    error = ilm_surfaceSetVisibility(surfaceid, ILM_TRUE);
-
-    cout << "Set surface " << surfaceid << " opacity " << opacity << "\n";
-    ilm_surfaceSetOpacity(surfaceid, opacity);
-
-    cout << "commit\n";
-    error = ilm_commitChanges();
-
     m_surfaceId = surfaceid;
 
     return error;
diff --git a/ivi-layermanagement-examples/EGLWLMockNavigation/src/main.cpp b/ivi-layermanagement-examples/EGLWLMockNavigation/src/main.cpp
index 0a6260f..9f8c1cd 100644
--- a/ivi-layermanagement-examples/EGLWLMockNavigation/src/main.cpp
+++ b/ivi-layermanagement-examples/EGLWLMockNavigation/src/main.cpp
@@ -40,7 +40,6 @@ int main (int argc, const char * argv[])
     UnsignedIntArgument surfaceId("surface", DEFAULT_SURFACE, argc, argv);
     IntArgument width("width", DEFAULT_WIDTH, argc, argv);
     IntArgument height("height", DEFAULT_HEIGHT, argc, argv);
-    FloatArgument opacity("opacity", DEFAULT_OPACITY, argc, argv);
     BoolArgument nosky("nosky", DEFAULT_NOSKY, argc, argv);
     BoolArgument help("help", DEFAULT_HELP, argc, argv);
 
@@ -54,8 +53,7 @@ int main (int argc, const char * argv[])
              << "  -nosky        do not render sky, background transparent (default " << DEFAULT_NOSKY << ")\n"
              << "  -surface x    render to surface id x (default " << DEFAULT_SURFACE << ")\n"
              << "  -width x      set surface width to x (default " << DEFAULT_WIDTH << ")\n"
-             << "  -height x     set surface height to x (default " << DEFAULT_HEIGHT << ")\n"
-             << "  -opacity x    set opacity of surface to x (default " << DEFAULT_OPACITY << ")\n\n";
+             << "  -height x     set surface height to x (default " << DEFAULT_HEIGHT << ")\n\n";
     }
     else
     {
@@ -63,7 +61,6 @@ int main (int argc, const char * argv[])
         config.surfaceId = surfaceId.get();
         config.surfaceWidth = width.get();
         config.surfaceHeight = height.get();
-        config.opacity = opacity.get();
         config.nosky = nosky.get();
 
         MockNavi navi(fps.get(), animSpeed.get(), &config);