volumeslider: rework of slider layout

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

diff --git a/app/main.cpp b/app/main.cpp
index bfce498..4921bf2 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,118 +16,22 @@
  * limitations under the License.
  */
 
-#include "paclient.h"
-#include "pacontrolmodel.h"
 
-#include <QtCore/QDebug>
-#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 <QtAGLExtras/AGLApplication>
 #include <QtQml/qqml.h>
-#include <QtQuick/qquickitem.h>
-#include <QtQuick/qquickview.h>
-#include <QQuickWindow>
-#include <libhomescreen.hpp>
-#include <qlibwindowmanager.h>
+
+#include "mixer.hpp"
+#include "audiorole.hpp"
 
 int main(int argc, char *argv[])
 {
-       QString myname = QString("Mixer");
-
-       QGuiApplication app(argc, argv);
-
-       QQuickStyle::setStyle("AGL");
-
-       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();
-
-       // 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");
-
-       QQmlApplicationEngine engine;
-       if (positionalArguments.length() == 2) {
-               int port = positionalArguments.takeFirst().toInt();
-               QString secret = positionalArguments.takeFirst();
-               QUrl bindingAddress;
-               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 *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")));
-
-               // 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()));
+        AGLApplication app(argc, argv);
+        app.setApplicationName("Mixer");
+        app.setupApplicationRole("mixer");
 
-               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)));
+        qmlRegisterType<Mixer>("Mixer", 1, 0, "Mixer");
+        app.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));
+        return app.exec();
 
-               // Initalize PA client
-               client->init();
-       }
-       return app.exec();
 }