Merge "homescreen: bluetooth: switch bluetooth power status" 6.99.1 6.99.2 guppy/6.99.1 guppy/6.99.2 guppy_6.99.1 guppy_6.99.2
authorScott Murray <scott.murray@konsulko.com>
Thu, 22 Nov 2018 15:03:32 +0000 (15:03 +0000)
committerGerrit Code Review <gerrit@automotivelinux.org>
Thu, 22 Nov 2018 15:03:32 +0000 (15:03 +0000)
homescreen/src/main.cpp

index 620c869..8ecfd68 100644 (file)
@@ -78,6 +78,7 @@ int main(int argc, char *argv[])
 
     int port = 1700;
     QString token = "wm";
+    QString graphic_role = "homescreen"; // defined in layers.json in Window Manager
 
     if (positionalArguments.length() == 2) {
         port = positionalArguments.takeFirst().toInt();
@@ -99,12 +100,12 @@ int main(int argc, char *argv[])
 
     AGLScreenInfo screenInfo(layoutHandler->get_scale_factor());
 
-    if (layoutHandler->requestSurface(QString("HomeScreen")) != 0) {
+    if (layoutHandler->requestSurface(graphic_role) != 0) {
         exit(EXIT_FAILURE);
     }
 
-    layoutHandler->set_event_handler(QLibWindowmanager::Event_SyncDraw, [layoutHandler](json_object *object) {
-        layoutHandler->endDraw(QString("HomeScreen"));
+    layoutHandler->set_event_handler(QLibWindowmanager::Event_SyncDraw, [layoutHandler, &graphic_role](json_object *object) {
+        layoutHandler->endDraw(graphic_role);
     });
 
     layoutHandler->set_event_handler(QLibWindowmanager::Event_ScreenUpdated, [layoutHandler, launcher](json_object *object) {