X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=844913fe9623cdd240cb3191584c723615430a88;hb=f2d1e14b5ecef1f464e3d38860ab474ce22fb2f0;hp=76e755b1310239daee88ad715c2d9bce506925b4;hpb=3fd71f4b6bc026f2f9054140f7bf612855e45d7d;p=apps%2Fmixer.git

diff --git a/app/main.cpp b/app/main.cpp
index 76e755b..844913f 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016 The Qt Company Ltd.
  * Copyright (C) 2016,2017 Konsulko Group
+ * Copyright (C) 2018 IoT.bzh
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,63 +16,115 @@
  * limitations under the License.
  */
 
-#include "paclient.h"
-#include "pacontrolmodel.h"
-
 #include <QtCore/QDebug>
+#include <QtCore/QCommandLineParser>
+#include <QtCore/QUrlQuery>
 #include <QtCore/QDir>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QThread>
 #include <QtGui/QGuiApplication>
 #include <QtQml/QQmlApplicationEngine>
 #include <QtQml/QQmlContext>
-#include <QtQml/qqml.h>
 #include <QtQuickControls2/QQuickStyle>
+#include <QtQml/qqml.h>
 #include <QtQuick/qquickitem.h>
 #include <QtQuick/qquickview.h>
-
-
-#ifdef HAVE_LIBHOMESCREEN
+#include <QQuickWindow>
+#ifndef NATIVE_BUILD
 #include <libhomescreen.hpp>
+#include <qlibwindowmanager.h>
+#else
+#include <QScreen>
 #endif
+#include "mixer.h"
 
 int main(int argc, char *argv[])
 {
-#ifdef HAVE_LIBHOMESCREEN
-	LibHomeScreen libHomeScreen;
-
-	if (!libHomeScreen.renderAppToAreaAllowed(0, 1)) {
-		qWarning() << "renderAppToAreaAllowed is denied";
-		return -1;
-	}
-#endif
+	QString myname = QString("Mixer");
 
 	QGuiApplication app(argc, argv);
 
 	QQuickStyle::setStyle("AGL");
 
-	// Fire up PA client QThread
-	QThread* pat = new QThread;
-	PaClient* client = new PaClient();
-	client->moveToThread(pat);
-	pat->start();
+	QCommandLineParser parser;
+	parser.addPositionalArgument("port", app.translate("main", "port for binding"));
+	parser.addPositionalArgument("secret", app.translate("main", "secret for binding"));
+	parser.addHelpOption();
+	parser.addVersionOption();
+	parser.process(app);
+	QStringList positionalArguments = parser.positionalArguments();
 
-	// Register the PA Control Model
-	qmlRegisterType<PaControlModel>("PaControlModel", 1, 0, "PaControlModel");
+        qmlRegisterType<Mixer>("Mixer", 1, 0, "Mixer");
 
 	QQmlApplicationEngine engine;
-	engine.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));
+	if (positionalArguments.length() == 2) {
+		int port = positionalArguments.takeFirst().toInt();
+		QString secret = positionalArguments.takeFirst();
+		QUrl bindingAddress;
+		bindingAddress.setScheme(QStringLiteral("ws"));
+		bindingAddress.setHost(QStringLiteral("localhost"));
+		bindingAddress.setPort(port);
+		bindingAddress.setPath(QStringLiteral("/api"));
+		QUrlQuery query;
+		query.addQueryItem(QStringLiteral("token"), secret);
+		bindingAddress.setQuery(query);
+		QQmlContext *context = engine.rootContext();
+		context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
+		qDebug() << "Connect to: " << bindingAddress;
 
-	// Find the instantiated model QObject and connect the signals/slots
-	QList<QObject *> mobjs = engine.rootObjects();
-	PaControlModel *pacm = mobjs.first()->findChild<PaControlModel *>("pacm");
-	QObject::connect(client, SIGNAL(controlAdded(int, QString, int, int, const char *, int)),
-			 pacm, SLOT(addOneControl(int, QString, int, int, const char *, int)));
-	QObject::connect(pacm, SIGNAL(volumeChanged(uint32_t, uint32_t, uint32_t, uint32_t)),
-			client, SLOT(setVolume(uint32_t, uint32_t, uint32_t, uint32_t)));
 
-	// Initalize PA client
-	client->init();
+#ifndef NATIVE_BUILD
+		LibHomeScreen* hs = new LibHomeScreen();
+		QLibWindowmanager* qwm = new QLibWindowmanager();
+
+		// WindowManager
+		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);
+		}
+	        // Create an event callbnewack against an event type. Here a lambda is called when SyncDraw event occurs
+            qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, myname](json_object*) {
+				fprintf(stderr, "Surface got syncDraw!\n");
+				qwm->endDraw(myname);
+			});
+
+		// 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){
+			qDebug("Surface %s got tapShortcut\n", myname.toStdString().c_str());
+			qwm->activateSurface(myname);
+		});
+#endif
+		engine.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));
+
+		// Find the instantiated model QObject and connect the signals/slots
+		QList<QObject*> mobjs = engine.rootObjects();
+                if (mobjs.empty())
+                {
+                    qDebug() << "[ERROR] Failed to load QML!";
+                    return -1;
+                }
+
+                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();
 }