X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=083b31633e87ffd7a7b17084581bd50e230a7668;hb=refs%2Fheads%2Fsandbox%2Fzheng_wenlong%2Fals2019;hp=a1cd02ec90ddb1376f520d40087d746167a49cbb;hpb=3a135394cd1410c2ee06dc64eb082f10dab67c87;p=apps%2Fmediaplayer.git

diff --git a/app/main.cpp b/app/main.cpp
index a1cd02e..083b316 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -26,16 +26,15 @@
 #include <QtQml/qqml.h>
 #include <QtQuickControls2/QQuickStyle>
 #include <QQuickWindow>
-#include <libhomescreen.hpp>
+#include <qlibhomescreen.h>
 #include <qlibwindowmanager.h>
-#include <bluetooth.h>
 #include <mediaplayer.h>
 
 #include <unistd.h>
 
 int main(int argc, char *argv[])
 {
-    QString myname = QString("MediaPlayer");
+    QString graphic_role = QString("music");
 
     QGuiApplication app(argc, argv);
 
@@ -65,7 +64,7 @@ int main(int argc, char *argv[])
         bindingAddress.setQuery(query);
         context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
         std::string token = secret.toStdString();
-        LibHomeScreen* hs = new LibHomeScreen();
+        QLibHomeScreen* qhs = new QLibHomeScreen();
         QLibWindowmanager* qwm = new QLibWindowmanager();
 
         // WindowManager
@@ -74,34 +73,31 @@ 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);
+        qhs->init(port, token.c_str());
+        // Set the event handler for Event_ShowWindow which will activate the surface for windowmanager
+        qhs->set_event_handler(QLibHomeScreen::Event_ShowWindow, [qwm, &graphic_role](json_object *object){
+            qDebug("Surface %s got showWindow\n", graphic_role.toStdString().c_str());
+            qwm->activateWindow(graphic_role);
         });
 
         context->setContextProperty("mediaplayer", new Mediaplayer(bindingAddress, context));
-        context->setContextProperty("bluetooth_connection", new Bluetooth(bindingAddress));
         context->setContextProperty(QStringLiteral("screenInfo"), &screenInfo);
 
-        usleep(300000);
-
         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()));
+        qhs->setQuickWindow(window);
     }
     return app.exec();
 }