Examples: updated according to ilmClient split

since out client applications should run stand-alone (without
a controlling instance like a HMI), all client use the ilm_control
API to be abled to add themselves to the scene.

Typical automotive cleint applications should NOT use ilm_control
and rely on ilm_client API only.

Signed-off-by: Timo Lotterbach <timo.lotterbach@bmw-carit.de>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3360742..18336bc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,7 @@ build_flag (WITH_EGL_EXAMPLE "Build examples for GLES/X11 based platforms" ON)
 if (WITH_EGL_EXAMPLE)
     add_subdirectory_once (LayerManagerUtils)
     add_subdirectory_once (LayerManagerClient/ilmClient)
+    add_subdirectory_once (LayerManagerClient/ilmControl)
     add_subdirectory_once (LayerManagerExamples/EGLX11ApplicationExample)
     add_subdirectory_once (LayerManagerExamples/EGLX11MockNavigation)
 endif(WITH_EGL_EXAMPLE)

diff --git a/LayerManagerExamples/EGLWLApplicationExample/CMakeLists.txt b/LayerManagerExamples/EGLWLApplicationExample/CMakeLists.txt
index a3af314..14a3a28 100644 (file)
--- a/LayerManagerExamples/EGLWLApplicationExample/CMakeLists.txt
+++ b/LayerManagerExamples/EGLWLApplicationExample/CMakeLists.txt
@@ -23,12 +23,13 @@ project_type(EXAMPLE)
 
 include_directories ("include")
 include_directories ("../../LayerManagerClient/ilmClient/include")
+include_directories ("../../LayerManagerClient/ilmControl/include")
 include_directories ("../LayerSceneDescriptionExample/include")
 include_directories ("../../LayerManagerUtils/include")
 
 add_executable(EGLWLApplicationExample src/egl_helper.cpp src/eglWL_application.cpp src/gles2application.cpp src/WaylandServerinfoProtocol.cpp)
 
-add_dependencies(EGLWLApplicationExample ilmClient)
+add_dependencies(EGLWLApplicationExample ilmClient ilmControl)
 add_dependencies(EGLWLApplicationExample LayerManagerUtils)
 
 find_package (GLESv2 REQUIRED)
@@ -42,6 +43,6 @@ include_directories(${WAYLAND_CLIENT_INCLUDE_DIR} ${FFI_INCLUDE_DIR})
 add_dependencies(EGLWLApplicationExample wayland-client)
 
 set(LIBS ${LIBS} ${GLESv2_LIBRARIES} ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_EGL_LIBRARIES} ${FFI_LIBRARIES} ${EGL_LIBRARY} LayerManagerUtils)
-target_link_libraries(EGLWLApplicationExample ${LIBS} ilmClient -ldl)
+target_link_libraries(EGLWLApplicationExample ${LIBS} ilmClient ilmControl -ldl)
 
 install (TARGETS EGLWLApplicationExample DESTINATION bin)

diff --git a/LayerManagerExamples/EGLWLApplicationExample/src/egl_helper.cpp b/LayerManagerExamples/EGLWLApplicationExample/src/egl_helper.cpp
index e41a480..1602803 100644 (file)
--- a/LayerManagerExamples/EGLWLApplicationExample/src/egl_helper.cpp
+++ b/LayerManagerExamples/EGLWLApplicationExample/src/egl_helper.cpp
@@ -19,6 +19,7 @@
  ****************************************************************************/
 #include "egl_helper.h"
 #include "LayerScene.h"
+#include "ilm_control.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/LayerManagerExamples/EGLWLInputEventExample/CMakeLists.txt b/LayerManagerExamples/EGLWLInputEventExample/CMakeLists.txt
index cc88851..3e679e9 100644 (file)
--- a/LayerManagerExamples/EGLWLInputEventExample/CMakeLists.txt
+++ b/LayerManagerExamples/EGLWLInputEventExample/CMakeLists.txt
@@ -33,7 +33,9 @@ include_directories(
     ${FFI_INCLUDE_DIR}
     "include"
     "../../LayerManagerClient/ilmClient/include"
+    "../../LayerManagerClient/ilmControl/include"
     "../../LayerManagerService/include"
+    "../../LayerManagerUtils/include"
 )
 
 set (HEADER_FILES
@@ -65,6 +67,7 @@ add_dependencies(EGLWLInputEventExample
     wayland-client
     wayland-egl
     ilmClient
+    ilmControl
 )
 
 set(LIBS
@@ -75,6 +78,7 @@ set(LIBS
     ${FFI_LIBRARIES}
        ${EGL_LIBRARY}
        ilmClient
+       ilmControl
 )
 
 target_link_libraries(EGLWLInputEventExample ${LIBS})

diff --git a/LayerManagerExamples/EGLWLInputEventExample/src/WLSurface.cpp b/LayerManagerExamples/EGLWLInputEventExample/src/WLSurface.cpp
index a31afc2..9c7a24b 100644 (file)
--- a/LayerManagerExamples/EGLWLInputEventExample/src/WLSurface.cpp
+++ b/LayerManagerExamples/EGLWLInputEventExample/src/WLSurface.cpp
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <assert.h>
 #include "WLSurface.h"
+#include "ilm_control.h"
 
 WLSurface::WLSurface(WLContext* wlContext)
 : m_wlContext(wlContext)

diff --git a/LayerManagerExamples/EGLWLMockNavigation/CMakeLists.txt b/LayerManagerExamples/EGLWLMockNavigation/CMakeLists.txt
index cd0935a..6a0549c 100644 (file)
--- a/LayerManagerExamples/EGLWLMockNavigation/CMakeLists.txt
+++ b/LayerManagerExamples/EGLWLMockNavigation/CMakeLists.txt
@@ -33,6 +33,7 @@ include_directories(
     ${FFI_INCLUDE_DIR}
     "include"
     "../../LayerManagerClient/ilmClient/include"
+    "../../LayerManagerClient/ilmControl/include"
     "../LayerSceneDescriptionExample/include"
     "../../LayerManagerUtils/include"
 )
@@ -88,6 +89,7 @@ set(LIBS
        ${EGL_LIBRARY}
        LayerManagerUtils
        ilmClient
+       ilmControl
 )
 
 #target_link_libraries(EGLWLMockNavigation ${LIBS} wayland-client -ldl)

diff --git a/LayerManagerExamples/EGLWLMockNavigation/src/OpenGLES2App.cpp b/LayerManagerExamples/EGLWLMockNavigation/src/OpenGLES2App.cpp
index 5f500b6..645b71d 100644 (file)
--- a/LayerManagerExamples/EGLWLMockNavigation/src/OpenGLES2App.cpp
+++ b/LayerManagerExamples/EGLWLMockNavigation/src/OpenGLES2App.cpp
@@ -20,6 +20,7 @@
 #include "OpenGLES2App.h"
 #include "LayerScene.h"
 #include <ilm_client.h>
+#include <ilm_control.h>
 
 #include <iostream>
 using std::cout;

diff --git a/LayerManagerExamples/EGLX11ApplicationExample/CMakeLists.txt b/LayerManagerExamples/EGLX11ApplicationExample/CMakeLists.txt
index fce8f8d..7fe356c 100644 (file)
--- a/LayerManagerExamples/EGLX11ApplicationExample/CMakeLists.txt
+++ b/LayerManagerExamples/EGLX11ApplicationExample/CMakeLists.txt
@@ -23,12 +23,13 @@ project_type(EXAMPLE)
 
 include_directories ("include")
 include_directories ("../../LayerManagerClient/ilmClient/include")
+include_directories ("../../LayerManagerClient/ilmControl/include")
 include_directories ("../LayerSceneDescriptionExample/include")
 include_directories ("../../LayerManagerUtils/include")
 
 add_executable(EGLX11ApplicationExample src/egl_helper.cpp src/eglX11_application.cpp src/gles2application.cpp)
 
-add_dependencies(EGLX11ApplicationExample ilmClient)
+add_dependencies(EGLX11ApplicationExample ilmControl ilmClient)
 add_dependencies(EGLX11ApplicationExample LayerManagerUtils)
 
 find_package (GLESv2 REQUIRED)
@@ -41,6 +42,6 @@ find_package (X11 REQUIRED)
 include_directories(${X11_INCLUDE_DIR})
 
 set(LIBS ${LIBS} ${GLESv2_LIBRARIES} ${X11_LIBRARIES} ${EGL_LIBRARY} LayerManagerUtils) 
-target_link_libraries(EGLX11ApplicationExample ${LIBS} ilmClient)
+target_link_libraries(EGLX11ApplicationExample ${LIBS} ilmClient ilmControl)
 
 install (TARGETS EGLX11ApplicationExample DESTINATION bin)
\ No newline at end of file

diff --git a/LayerManagerExamples/EGLX11ApplicationExample/src/egl_helper.cpp b/LayerManagerExamples/EGLX11ApplicationExample/src/egl_helper.cpp
index a29b91b..aa207cb 100644 (file)
--- a/LayerManagerExamples/EGLX11ApplicationExample/src/egl_helper.cpp
+++ b/LayerManagerExamples/EGLX11ApplicationExample/src/egl_helper.cpp
@@ -18,6 +18,7 @@
  ****************************************************************************/
 #include "egl_helper.h"
 #include "LayerScene.h"
+#include "ilm_control.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/time.h>

diff --git a/LayerManagerExamples/EGLX11MockNavigation/CMakeLists.txt b/LayerManagerExamples/EGLX11MockNavigation/CMakeLists.txt
index 578151a..68f453b 100644 (file)
--- a/LayerManagerExamples/EGLX11MockNavigation/CMakeLists.txt
+++ b/LayerManagerExamples/EGLX11MockNavigation/CMakeLists.txt
@@ -31,6 +31,7 @@ include_directories(
     ${X11_INCLUDE_DIR}
     "include"
     "../../LayerManagerClient/ilmClient/include"
+    "../../LayerManagerClient/ilmControl/include"
     "../LayerSceneDescriptionExample/include"
     "../../LayerManagerUtils/include"
 )
@@ -73,6 +74,7 @@ add_executable(EGLX11MockNavigation
 
 add_dependencies(EGLX11MockNavigation
     ilmClient
+    ilmControl
     EGLX11MockNavigation LayerManagerUtils
 )
 
@@ -83,6 +85,7 @@ set(LIBS
        ${EGL_LIBRARY}
        LayerManagerUtils
        ilmClient
+       ilmControl
 )
 
 target_link_libraries(EGLX11MockNavigation ${LIBS})

diff --git a/LayerManagerExamples/EGLX11MockNavigation/src/OpenGLES2App.cpp b/LayerManagerExamples/EGLX11MockNavigation/src/OpenGLES2App.cpp
index f15235f..1237233 100644 (file)
--- a/LayerManagerExamples/EGLX11MockNavigation/src/OpenGLES2App.cpp
+++ b/LayerManagerExamples/EGLX11MockNavigation/src/OpenGLES2App.cpp
@@ -19,6 +19,7 @@
 #include "OpenGLES2App.h"
 #include "LayerScene.h"
 #include <ilm_client.h>
+#include <ilm_control.h>
 
 #include <iostream>
 using std::cout;

diff --git a/LayerManagerExamples/GLXApplicationExample/CMakeLists.txt b/LayerManagerExamples/GLXApplicationExample/CMakeLists.txt
index 29bf150..93e64c8 100644 (file)
--- a/LayerManagerExamples/GLXApplicationExample/CMakeLists.txt
+++ b/LayerManagerExamples/GLXApplicationExample/CMakeLists.txt
@@ -25,12 +25,13 @@ include_directories ("include")
 include_directories ("${PROJECT_SOURCE_DIR}/config")
 include_directories ("../../LayerManagerService/include")
 include_directories ("../../LayerManagerClient/ilmClient/include")
+include_directories ("../../LayerManagerClient/ilmControl/include")
 include_directories ("../LayerSceneDescriptionExample/include")
 include_directories ("../../LayerManagerUtils/include")
 
 add_executable(GLX11ApplicationExample src/glx_helper.cpp src/glxX11_application.cpp src/gl2application.cpp src/xevents.cpp)
 
-add_dependencies(GLX11ApplicationExample ilmClient)
+add_dependencies(GLX11ApplicationExample ilmClient ilmControl)
 add_dependencies(GLX11ApplicationExample LayerManagerUtils) 
 
 find_package (OpenGL REQUIRED)
@@ -40,6 +41,6 @@ find_package(X11 REQUIRED)
 include_directories(${X11_INCLUDE_DIR})
 
 set(LIBS ${LIBS} ${OPENGL_LIBRARIES} ${X11_LIBRARIES} LayerManagerUtils) 
-target_link_libraries(GLX11ApplicationExample ${LIBS} ilmClient)
+target_link_libraries(GLX11ApplicationExample ${LIBS} ilmClient ilmControl)
 
 install (TARGETS GLX11ApplicationExample DESTINATION bin) 

diff --git a/LayerManagerExamples/GLXApplicationExample/src/glx_helper.cpp b/LayerManagerExamples/GLXApplicationExample/src/glx_helper.cpp
index 38f4304..27770ad 100644 (file)
--- a/LayerManagerExamples/GLXApplicationExample/src/glx_helper.cpp
+++ b/LayerManagerExamples/GLXApplicationExample/src/glx_helper.cpp
@@ -20,6 +20,7 @@
 #include "config.h"
 #include "xevents.h"
 #include "LayerScene.h"
+#include "ilm_control.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/time.h>

diff --git a/LayerManagerExamples/GLXApplicationExample/src/xevents.cpp b/LayerManagerExamples/GLXApplicationExample/src/xevents.cpp
index 9cdc348..f179a00 100644 (file)
--- a/LayerManagerExamples/GLXApplicationExample/src/xevents.cpp
+++ b/LayerManagerExamples/GLXApplicationExample/src/xevents.cpp
@@ -21,6 +21,7 @@
 #include <iostream>
 
 #include "ilm_client.h"
+#include "ilm_control.h"
 #include "LayerScene.h"
 #include "xevents.h"
 

diff --git a/LayerManagerExamples/LayerManagerClientExample/CMakeLists.txt b/LayerManagerExamples/LayerManagerClientExample/CMakeLists.txt
index 7c0c61f..4187657 100644 (file)
--- a/LayerManagerExamples/LayerManagerClientExample/CMakeLists.txt
+++ b/LayerManagerExamples/LayerManagerClientExample/CMakeLists.txt
@@ -21,13 +21,14 @@
 project_type(EXAMPLE)
 
 include_directories ("../../LayerManagerClient/ilmClient/include")
+include_directories ("../../LayerManagerClient/ilmControl/include")
 include_directories ("../LayerSceneDescriptionExample/include")
 include_directories ("../../LayerManagerUtils/include")
 
 add_executable(LayerManagerClientExample src/LayermanagerClientTest.c)
-add_dependencies(LayerManagerClientExample ilmClient)
+add_dependencies(LayerManagerClientExample ilmClient ilmControl)
 add_dependencies(LayerManagerClientExample LayerManagerUtils)
 
-target_link_libraries(LayerManagerClientExample ${LIBS} ilmClient)
+target_link_libraries(LayerManagerClientExample ${LIBS} ilmClient ilmControl)
 
 install (TARGETS LayerManagerClientExample DESTINATION bin)
\ No newline at end of file

diff --git a/LayerManagerExamples/LayerManagerClientExample/src/LayermanagerClientTest.c b/LayerManagerExamples/LayerManagerClientExample/src/LayermanagerClientTest.c
index 1f35096..0ccf454 100644 (file)
--- a/LayerManagerExamples/LayerManagerClientExample/src/LayermanagerClientTest.c
+++ b/LayerManagerExamples/LayerManagerClientExample/src/LayermanagerClientTest.c
@@ -17,6 +17,7 @@
  *
  ****************************************************************************/
 #include "ilm_client.h"
+#include "ilm_control.h"
 #include "LayerScene.h"
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/LayerManagerExamples/WLChromakeyExample/CMakeLists.txt b/LayerManagerExamples/WLChromakeyExample/CMakeLists.txt
index 0dcc44a..9b8acfc 100644 (file)
--- a/LayerManagerExamples/WLChromakeyExample/CMakeLists.txt
+++ b/LayerManagerExamples/WLChromakeyExample/CMakeLists.txt
@@ -33,6 +33,7 @@ include_directories(
     ${FFI_INCLUDE_DIR}
     "include"
     "../../LayerManagerClient/ilmClient/include"
+    "../../LayerManagerClient/ilmControl/include"
     "../../LayerManagerUtils/include"
 )
 
@@ -66,6 +67,7 @@ set(LIBS
        ${EGL_LIBRARY}
        LayerManagerUtils
        ilmClient
+       ilmControl
 )
 
 target_link_libraries(WLChromakeyExample ${LIBS})