summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-11-15 18:37:36 +0900
committerKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-11-15 18:47:05 +0900
commit91458dc8aac1edfc8caed6e6970afa934fb3082e (patch)
tree759c57ea6503388ebd03117d53df968363e41b2c /app
parent3a135394cd1410c2ee06dc64eb082f10dab67c87 (diff)
Modify graphics role
Window Manager set role name as lower_case, and HomeScreen has fixed application name problem, then change role as lower_case. Bug-AGL: SPEC-1754 Change-Id: I5e1da25a00182ff67c726d38f7cfe90585626973 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
Diffstat (limited to 'app')
-rw-r--r--app/main.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/app/main.cpp b/app/main.cpp
index a1cd02e..24a78aa 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -35,7 +35,7 @@
int main(int argc, char *argv[])
{
- QString myname = QString("MediaPlayer");
+ QString graphic_role = QString("music");
QGuiApplication app(argc, argv);
@@ -74,21 +74,21 @@ int main(int argc, char *argv[])
}
AGLScreenInfo screenInfo(qwm->get_scale_factor());
// Request a surface as described in layers.json windowmanager’s file
- if (qwm->requestSurface(myname) != 0) {
+ if (qwm->requestSurface(graphic_role) != 0) {
exit(EXIT_FAILURE);
}
// Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs
- qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, myname](json_object *object) {
+ qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, &graphic_role](json_object *object) {
fprintf(stderr, "Surface got syncDraw!\n");
- qwm->endDraw(myname);
+ qwm->endDraw(graphic_role);
});
// HomeScreen
hs->init(port, token.c_str());
// Set the event handler for Event_TapShortcut which will activate the surface for windowmanager
- hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, myname](json_object *object){
- qDebug("Surface %s got tapShortcut\n", myname.toStdString().c_str());
- qwm->activateSurface(myname);
+ hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, &graphic_role](json_object *object){
+ qDebug("Surface %s got tapShortcut\n", graphic_role.toStdString().c_str());
+ qwm->activateWindow(graphic_role);
});
context->setContextProperty("mediaplayer", new Mediaplayer(bindingAddress, context));
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));
QObject *root = engine.rootObjects().first();
QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
- QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()
+ QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateWindow()
));
}
return app.exec();