From 00ea0ea0dcdbaedf8f5563bfbbe21b416ae645ba Mon Sep 17 00:00:00 2001
From: Holger Behrens <holger.behrens@windriver.com>
Date: Fri, 20 Feb 2015 12:31:57 +0100
Subject: gdp-hmi-controller: update layer assignments

Signed-off-by: Holger Behrens <holger.behrens@windriver.com>
---
 include/gdp-hmi-apps.h     | 15 ++++++++-------
 src/gdp-hmi-controller.cpp | 16 +++++++++-------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/include/gdp-hmi-apps.h b/include/gdp-hmi-apps.h
index 373f135..07e8626 100644
--- a/include/gdp-hmi-apps.h
+++ b/include/gdp-hmi-apps.h
@@ -14,6 +14,7 @@
  * List of changes:
  * 11.Feb.2015, Holger Behrens, written
  * 16.Feb.2015, Holger Behrens, added generic identifier
+ * 20.Feb.2015, Holger Behrens, updated BROWSER_POC_UNIT
  */
 
 #ifndef GDP_HMI_APP_H
@@ -41,30 +42,30 @@
 
 #define AM_DEMO                         4
 #define AM_DEMO_SURFACE_ID              20
-#define AM_DEMO_LAYER_ID                300
+#define AM_DEMO_LAYER_ID                400
 #define AM_DEMO_UNIT                    "AudioManager_PoC.service"
 
 #define BROWSER_POC                     5
 #define BROWSER_POC_SURFACE_ID          30
-#define BROWSER_POC_LAYER_ID            400
-#define BROWSER_POC_UNIT                "browser.service"
+#define BROWSER_POC_LAYER_ID            500
+#define BROWSER_POC_UNIT                "demoui.service"
 
 #define FSA                             6
 #define FSA_SURFACE_ID                  40
-#define FSA_LAYER_ID                    500
+#define FSA_LAYER_ID                    600
 #define FSA_UNIT                        "fsa.service"
 
 #define MOCK_NAVIGATION                 7
 #define MOCK_NAVIGATION_SURFACE_ID      10
-#define MOCK_NAVIGATION_LAYER_ID        600
+#define MOCK_NAVIGATION_LAYER_ID        700
 #define MOCK_NAVIGATION_UNIT            "EGLWLMockNavigation.service"
 
 #define INPUT_EVENT_EXAMPLE             8
 #define INPUT_EVENT_EXAMPLE_SURFACE_ID  5100
-#define INPUT_EVENT_EXAMPLE_LAYER_ID    700
+#define INPUT_EVENT_EXAMPLE_LAYER_ID    800
 #define INPUT_EVENT_EXAMPLE_UNIT        "EGLWLInputEventExample.service"
 
-#define GDP_MAX_LAYER_ID                800
+#define GDP_MAX_LAYER_ID                900
 #define GDP_LAYER_ID_INCR               100
 
 #endif // GDP_HMI_APP_H
\ No newline at end of file
diff --git a/src/gdp-hmi-controller.cpp b/src/gdp-hmi-controller.cpp
index 8212d11..63afa7d 100644
--- a/src/gdp-hmi-controller.cpp
+++ b/src/gdp-hmi-controller.cpp
@@ -18,6 +18,7 @@
  * 09.Feb.2015, Holger Behrens, convert main loop into a glib main loop
  * 10.Feb.2015, Holger Behrens, added interface to systemd (via dbus-c++)
  * 16.Feb.2015, Holger Behrens, correct gdp_surfaces[] usage
+ * 20.Feb.2015, Holger Behrens, reflect new layer assignment in comment made
  */
 
 /*! \file gdp-hmi-controller.cpp
@@ -190,12 +191,12 @@ int create_pid_file(const char *progName, const char *pidFile)
  * panel               |    0
  * launcher            |   100
  * background          |   200
- * AM PoC              |   300
- * Browser PoC         |   400
- * FSA PoC             |   500
- * MockNavigation      |   600
- * InputEventExample   |   700
- *
+ * QML Example         |   300
+ * AM PoC              |   400
+ * Browser PoC         |   500
+ * FSA PoC             |   600
+ * MockNavigation      |   700
+ * InputEventExample   |   800
  */
 static void layer_create(void)
 {
@@ -361,7 +362,8 @@ static void launcher_show(const struct gdp_surface_context gdp_surface)
         ILM_TRUE);
     callResult = ilm_commitChanges();
 
-    sd_journal_print(LOG_DEBUG, "launcher_show - render order - screen\n");
+    sd_journal_print(LOG_DEBUG, "launcher_show - render order - screen %u\n",
+        screenID);
     callResult = ilm_displaySetRenderOrder((t_ilm_display)screenID,
         layerIdArray, 1);
 
-- 
cgit v1.2.1