Use appid between homescreen-service and apps

[apps/mediaplayer.git] / app / main.cpp

diff --git a/app/main.cpp b/app/main.cpp
index 928b825..a1cd02e 100644 (file)
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -28,8 +28,11 @@
 #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");
@@ -69,6 +72,7 @@ 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) {
             exit(EXIT_FAILURE);
@@ -83,19 +87,16 @@ int main(int argc, char *argv[])
         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);
-                }
-            }
+            qDebug("Surface %s got tapShortcut\n", myname.toStdString().c_str());
+            qwm->activateSurface(myname);
         });
 
-        context->setContextProperty("mediaplayer", new Mediaplayer(bindingAddress));
+        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);