X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=255b39d833e76149e42a9f57e76d213ff7bdc13d;hb=d32d36b936cb031ba1b11c67c0d9c6afbdc280b3;hp=bfce4988e09ad3ecbe849f9a49f19baa35185fe0;hpb=d9bb450ee8898cb810027897a32afd3adcb05d9f;p=apps%2Fmixer.git

diff --git a/app/main.cpp b/app/main.cpp
index bfce498..255b39d 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,13 +16,11 @@
  * limitations under the License.
  */
 
-#include "paclient.h"
-#include "pacontrolmodel.h"
-
 #include <QtCore/QDebug>
 #include <QtCore/QCommandLineParser>
 #include <QtCore/QUrlQuery>
 #include <QtCore/QDir>
+#include <QtCore/QList>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QThread>
 #include <QtGui/QGuiApplication>
@@ -32,12 +31,18 @@
 #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.hpp"
+#include "audiorole.hpp"
 
 int main(int argc, char *argv[])
 {
-	QString myname = QString("Mixer");
+	QString graphic_role = QString("mixer");
 
 	QGuiApplication app(argc, argv);
 
@@ -51,14 +56,7 @@ int main(int argc, char *argv[])
 	parser.process(app);
 	QStringList positionalArguments = parser.positionalArguments();
 
-	// Fire up PA client QThread
-	QThread* pat = new QThread;
-	PaClient* client = new PaClient();
-	client->moveToThread(pat);
-	pat->start();
-
-	// Register the PA Control Model
-	qmlRegisterType<PaControlModel>("PaControlModel", 1, 0, "PaControlModel");
+	qmlRegisterType<Mixer>("Mixer", 1, 0, "Mixer");
 
 	QQmlApplicationEngine engine;
 	if (positionalArguments.length() == 2) {
@@ -74,8 +72,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();
 
@@ -83,50 +83,52 @@ 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("scale_factor"), screenInfo.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 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 *object) {
-				fprintf(stderr, "Surface got syncDraw!\n");
-				qwm->endDraw(myname);
-			});
+		// 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, &graphic_role](json_object*) {
+			fprintf(stderr, "Surface got syncDraw!\n");
+			qwm->endDraw(graphic_role);
+		});
 
 		// 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){
-			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);
 		});
-
+#else
+		engine.rootContext()->setContextProperty(QStringLiteral("scale_factor"), 1.0);
+#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()));
-
-		PaControlModel *pacm = mobjs.first()->findChild<PaControlModel *>("pacm");
-		QObject::connect(client, SIGNAL(controlAdded(int, QString, QString, int, int, const char *, int)),
-				 pacm, SLOT(addOneControl(int, QString, QString, int, int, const char *, int)));
-		QObject::connect(client, SIGNAL(volumeExternallyChanged(uint32_t, uint32_t, uint32_t, uint32_t)),
-				 pacm, SLOT(changeExternalVolume(uint32_t, uint32_t, uint32_t, uint32_t)));
-		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();
+#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(slotActivateWindow()));
+#endif
+	}
+	else
+	{
+		qDebug() << "[ERROR] No port and token specified!";
+		return -1;
 	}
+
 	return app.exec();
 }