Reworked the way qml create sliders

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

diff --git a/app/main.cpp b/app/main.cpp
index 52a0ff9..255b39d 100644 (file)
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -20,6 +20,7 @@
 #include <QtCore/QCommandLineParser>
 #include <QtCore/QUrlQuery>
 #include <QtCore/QDir>
+#include <QtCore/QList>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QThread>
 #include <QtGui/QGuiApplication>
@@ -36,11 +37,12 @@
 #else
 #include <QScreen>
 #endif
-#include "mixer.h"
+#include "mixer.hpp"
+#include "audiorole.hpp"
 
 int main(int argc, char *argv[])
 {
-       QString myname = QString("Mixer");
+       QString graphic_role = QString("mixer");
 
        QGuiApplication app(argc, argv);
 
@@ -54,7 +56,7 @@ int main(int argc, char *argv[])
        parser.process(app);
        QStringList positionalArguments = parser.positionalArguments();
 
-        qmlRegisterType<Mixer>("Mixer", 1, 0, "Mixer");
+       qmlRegisterType<Mixer>("Mixer", 1, 0, "Mixer");
 
        QQmlApplicationEngine engine;
        if (positionalArguments.length() == 2) {
@@ -81,56 +83,52 @@ 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("scale_factor"), screenInfo.scale_factor());
                // Request a surface as described in layers.json windowmanager’s file
-               if (qwm->requestSurface(myname) != 0) {
+               if (qwm->requestSurface(graphic_role) != 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);
-                       });
+               // 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, &graphic_role](json_object*) {
+                       fprintf(stderr, "Surface got syncDraw!\n");
+                       qwm->endDraw(graphic_role);
+               });
 
                // 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);
-                               }
-                       }
+               hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, &graphic_role](json_object *object){
+                       qDebug("Surface %s got tapShortcut\n", graphic_role.toStdString().c_str());
+                       qwm->activateWindow(graphic_role);
                });
+#else
+               engine.rootContext()->setContextProperty(QStringLiteral("scale_factor"), 1.0);
 #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;
-                }
+               if (mobjs.empty())
+               {
+                       qDebug() << "[ERROR] Failed to load QML!";
+                       return -1;
+               }
 
-                QQuickWindow *window = qobject_cast<QQuickWindow *>(mobjs.first());
+               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());
+               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()));
+               QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateWindow()));
 #endif
        }
-        else
-        {
-            qDebug() << "[ERROR] No port and token specified!";
-            return -1;
-        }
+       else
+       {
+               qDebug() << "[ERROR] No port and token specified!";
+               return -1;
+       }
 
        return app.exec();
 }