X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=53ce4d554a88b8ad775bafc82f1791930915fcbb;hb=refs%2Ftags%2Fguppy_6.99.1;hp=8fa8117e7cd005a0c2db07d27ca3804264b9acba;hpb=13bb3fad73f1933e75ea17e101c5f8a3d2c2f561;p=apps%2Fmediaplayer.git

diff --git a/app/main.cpp b/app/main.cpp
index 8fa8117..53ce4d5 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -28,12 +28,13 @@
 #include <QQuickWindow>
 #include <libhomescreen.hpp>
 #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);
 
@@ -70,38 +71,34 @@ int main(int argc, char *argv[])
         if(qwm->init(port,secret) != 0){
             exit(EXIT_FAILURE);
         }
+        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){
-            json_object *appnameJ = nullptr;
-            if(json_object_object_get_ex(object, "application_name", &appnameJ))
-            {
-                const char *appname = json_object_get_string(appnameJ);
-                if(myname == appname)
-                {
-                    qDebug("Surface %s got tapShortcut\n", appname);
-                    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->setContextProperty("bluetooth_connection", new Bluetooth(bindingAddress));
+        context->setContextProperty("mediaplayer", new Mediaplayer(bindingAddress, context));
+        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()
         ));
     }
     return app.exec();