Revert "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..3f38cc0 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);
@@ -95,7 +99,12 @@ int main(int argc, char *argv[])
             }
         });
 
-        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);