delete application_name check in tap_shortcut event

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

diff --git a/app/main.cpp b/app/main.cpp
index bfce498..844913f 100644 (file)
--- 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,9 +16,6 @@
  * limitations under the License.
  */
 
-#include "paclient.h"
-#include "pacontrolmodel.h"
-
 #include <QtCore/QDebug>
 #include <QtCore/QCommandLineParser>
 #include <QtCore/QUrlQuery>
@@ -32,8 +30,13 @@
 #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"
 
 int main(int argc, char *argv[])
 {
@@ -51,14 +54,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 +70,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 +81,50 @@ 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("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) {
+            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);
-                               }
-                       }
+                       qDebug("Surface %s got tapShortcut\n", myname.toStdString().c_str());
+                       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();
-
-               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();
+               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();
 }