app/main: Bring back secret and port to be able to access the

[apps/mixer.git] / app / main.cpp

diff --git a/app/main.cpp b/app/main.cpp
index b8ef25a..76efbbf 100644 (file)
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -16,35 +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>
-#ifndef NATIVE_BUILD
-#include <libhomescreen.hpp>
-#include <qlibwindowmanager.h>
-#else
-#include <QScreen>
-#endif
-#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"));
@@ -54,85 +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);
-               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
+               qmlRegisterType<Mixer>("Mixer", 1, 0, "Mixer");
        }
-        else
-        {
-            qDebug() << "[ERROR] No port and token specified!";
-            return -1;
-        }
 
-       return app.exec();
+       engine.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));
+        return app.exec();
+
 }