X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=76efbbfd2b2861fe715efdef05c13ff93b8beed4;hb=refs%2Ftags%2F9.99.1;hp=9c6339fa8469100d80bccdc12a9446a6647ff2cb;hpb=63dc51c35d26c837295ac0ef33c1b8e41353ea35;p=apps%2Fmixer.git

diff --git a/app/main.cpp b/app/main.cpp
index 9c6339f..76efbbf 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -16,31 +16,25 @@
  * limitations under the License.
  */
 
-#include <QtCore/QDebug>
+#include <QGuiApplication>
 #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 <QtQml/QQmlApplicationEngine>
 #include <QtQml/qqml.h>
-#include <QtQuick/qquickitem.h>
-#include <QtQuick/qquickview.h>
-#include <QQuickWindow>
-#include <libhomescreen.hpp>
-#include <qlibwindowmanager.h>
-#include "mixer.h"
+#include <QDebug>
+
+#include "mixer.hpp"
+#include "audiorole.hpp"
 
 int main(int argc, char *argv[])
 {
-	QString myname = QString("Mixer");
+        QGuiApplication app(argc, argv);
+        app.setDesktopFileName("mixer");
 
-	QGuiApplication app(argc, argv);
-
-	QQuickStyle::setStyle("AGL");
+	QQmlApplicationEngine engine;
+	QQmlContext *context = engine.rootContext();
 
 	QCommandLineParser parser;
 	parser.addPositionalArgument("port", app.translate("main", "port for binding"));
@@ -50,64 +44,27 @@ int main(int argc, char *argv[])
 	parser.process(app);
 	QStringList positionalArguments = parser.positionalArguments();
 
-    qmlRegisterType<Mixer>("Mixer", 1, 0, "Mixer");
-
-	QQmlApplicationEngine engine;
 	if (positionalArguments.length() == 2) {
 		int port = positionalArguments.takeFirst().toInt();
 		QString secret = positionalArguments.takeFirst();
+
 		QUrl bindingAddress;
+		QUrlQuery query;
+
 		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);
 
-		std::string token = secret.toStdString();
-		LibHomeScreen* hs = new LibHomeScreen();
-		QLibWindowmanager* qwm = new QLibWindowmanager();
-
-		// WindowManager
-		if(qwm->init(port,secret) != 0){
-			exit(EXIT_FAILURE);
-		}
-		// 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
-		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);
-				}
-			}
-		});
-
-		engine.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));
+		qmlRegisterType<Mixer>("Mixer", 1, 0, "Mixer");
+	}
 
-		// Find the instantiated model QObject and connect the signals/slots
-		QList<QObject *> mobjs = engine.rootObjects();
+	engine.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));
+        return app.exec();
 
-		QQuickWindow *window = qobject_cast<QQuickWindow *>(mobjs.first());
-		QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()));
-	}
-	return app.exec();
 }