X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=2fac9aebff50aeae39383d7bbf6016608d90953a;hb=f4cb3ec807e23788299f9bf1d9c323ff5690aafd;hp=0bfdd52920bc537d75bc7289889f1330b98c3f65;hpb=e884c02d9da06a59019c66dc31d1d5350eab1504;p=apps%2Fhvac.git

diff --git a/app/main.cpp b/app/main.cpp
index 0bfdd52..2fac9ae 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -14,103 +14,18 @@
  * limitations under the License.
  */
 
-#include <QtCore/QDebug>
-#include <QtCore/QCommandLineParser>
-#include <QtCore/QUrlQuery>
-#include <QtGui/QGuiApplication>
+#include <QtAGLExtras/AGLApplication>
 #include <QtQml/QQmlApplicationEngine>
-#include <QtQml/QQmlContext>
-#include <QtQuick/QQuickWindow>
 
 #include "translator.h"
 
-#ifdef HAVE_LIBHOMESCREEN
-#include <libhomescreen.hpp>
-#endif
-#ifdef HAVE_QLIBWINDOWMANAGER
-#include <qlibwindowmanager.h>
-#endif
-
 int main(int argc, char *argv[])
 {
-    QString myname = QString("HVAC");
-
-    QGuiApplication app(argc, argv);
-    app.setApplicationVersion(QStringLiteral("0.1.0"));
-    app.setOrganizationDomain(QStringLiteral("automotivelinux.org"));
-    app.setOrganizationName(QStringLiteral("AutomotiveGradeLinux"));
-
-    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("HVAC");
+    app.setupApplicationRole("hvac");
     qmlRegisterType<Translator>("Translator", 1, 0, "Translator");
-
-    QQmlApplicationEngine engine;
-    QQmlContext *context = engine.rootContext();
-    QUrl bindingAddress;
-
-    int port;
-    QString secret;
-    if (positionalArguments.length() == 2) {
-        port = positionalArguments.takeFirst().toInt();
-        secret = positionalArguments.takeFirst();
-        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);
-    }
-    context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
-#ifdef HAVE_QLIBWINDOWMANAGER
-    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 *object) {
-        fprintf(stderr, "Surface got syncDraw!\n");
-        qwm->endDraw(myname);
-    });
-#endif
-
-#ifdef HAVE_LIBHOMESCREEN
-    LibHomeScreen* hs = new LibHomeScreen();
-
-    // 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:/HVAC.qml")));
-    QObject *root = engine.rootObjects().first();
-    QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
-#ifdef HAVE_QLIBWINDOWMANAGER
-    QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()));
-#else
-    window->resize(1080, 1920 - 218 - 215);
-    window->setVisible(true);
-#endif
-
+    app.load(QUrl(QStringLiteral("qrc:/HVAC.qml")));
     return app.exec();
 }