X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=4921bf2e93f3b81129433fe1c2fd5fb973d0b2d6;hb=cd772d4009778020073318fb8845095aa81c0f8c;hp=b8ef25a85721f7a9ea348dd8da6b4430e68c5eb7;hpb=c647ed440383305e65b5c54eccf1ad356debd2e5;p=apps%2Fmixer.git

diff --git a/app/main.cpp b/app/main.cpp
index b8ef25a..4921bf2 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -16,123 +16,22 @@
  * limitations under the License.
  */
 
-#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 <QtQuickControls2/QQuickStyle>
+#include <QtAGLExtras/AGLApplication>
 #include <QtQml/qqml.h>
-#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"
+
+#include "mixer.hpp"
+#include "audiorole.hpp"
 
 int main(int argc, char *argv[])
 {
-	QString myname = QString("Mixer");
-
-	QGuiApplication app(argc, argv);
-
-	QQuickStyle::setStyle("AGL");
-
-	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();
+        AGLApplication app(argc, argv);
+        app.setApplicationName("Mixer");
+        app.setupApplicationRole("mixer");
 
         qmlRegisterType<Mixer>("Mixer", 1, 0, "Mixer");
+        app.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));
+        return app.exec();
 
-	QQmlApplicationEngine engine;
-	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;
-
-
-#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){
-			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);
-				}
-			}
-		});
-#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();
 }