X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=app%2Fmain.cpp;h=b8ef25a85721f7a9ea348dd8da6b4430e68c5eb7;hb=refs%2Fheads%2Fsandbox%2Fruke47%2Fflounder_RPi3;hp=9c6339fa8469100d80bccdc12a9446a6647ff2cb;hpb=63dc51c35d26c837295ac0ef33c1b8e41353ea35;p=apps%2Fmixer.git

diff --git a/app/main.cpp b/app/main.cpp
index 9c6339f..b8ef25a 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -30,8 +30,12 @@
 #include <QtQuick/qquickitem.h>
 #include <QtQuick/qquickview.h>
 #include <QQuickWindow>
+#ifndef NATIVE_BUILD
 #include <libhomescreen.hpp>
 #include <qlibwindowmanager.h>
+#else
+#include <QScreen>
+#endif
 #include "mixer.h"
 
 int main(int argc, char *argv[])
@@ -50,7 +54,7 @@ int main(int argc, char *argv[])
 	parser.process(app);
 	QStringList positionalArguments = parser.positionalArguments();
 
-    qmlRegisterType<Mixer>("Mixer", 1, 0, "Mixer");
+        qmlRegisterType<Mixer>("Mixer", 1, 0, "Mixer");
 
 	QQmlApplicationEngine engine;
 	if (positionalArguments.length() == 2) {
@@ -66,8 +70,10 @@ int main(int argc, char *argv[])
 		bindingAddress.setQuery(query);
 		QQmlContext *context = engine.rootContext();
 		context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
+		qDebug() << "Connect to: " << bindingAddress;
 
-		std::string token = secret.toStdString();
+
+#ifndef NATIVE_BUILD
 		LibHomeScreen* hs = new LibHomeScreen();
 		QLibWindowmanager* qwm = new QLibWindowmanager();
 
@@ -75,6 +81,8 @@ int main(int argc, char *argv[])
 		if(qwm->init(port,secret) != 0){
 			exit(EXIT_FAILURE);
 		}
+		AGLScreenInfo screenInfo(qwm->get_scale_factor());
+		engine.rootContext()->setContextProperty(QStringLiteral("screenInfo"), &screenInfo);
 		// Request a surface as described in layers.json windowmanager’s file
 		if (qwm->requestSurface(myname) != 0) {
 			exit(EXIT_FAILURE);
@@ -86,6 +94,7 @@ int main(int argc, char *argv[])
 			});
 
 		// HomeScreen
+		std::string token = secret.toStdString();
 		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){
@@ -100,14 +109,30 @@ int main(int argc, char *argv[])
 				}
 			}
 		});
-
+#endif
 		engine.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));
 
 		// Find the instantiated model QObject and connect the signals/slots
-		QList<QObject *> mobjs = engine.rootObjects();
+		QList<QObject*> mobjs = engine.rootObjects();
+                if (mobjs.empty())
+                {
+                    qDebug() << "[ERROR] Failed to load QML!";
+                    return -1;
+                }
 
-		QQuickWindow *window = qobject_cast<QQuickWindow *>(mobjs.first());
-		QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()));
+                QQuickWindow *window = qobject_cast<QQuickWindow *>(mobjs.first());
+#ifdef NATIVE_BUILD
+                window->setFlags(window->flags() & ~Qt::FramelessWindowHint); // Remove the borderless flag
+                window->setHeight(QGuiApplication::primaryScreen()->geometry().height());
+#else
+                QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()));
+#endif
 	}
+        else
+        {
+            qDebug() << "[ERROR] No port and token specified!";
+            return -1;
+        }
+
 	return app.exec();
 }