volumeslider: rework of slider layout

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

diff --git a/app/main.cpp b/app/main.cpp
index d89287c..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 Konsulko Group
+ * 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,42 +16,22 @@
  * limitations under the License.
  */
 
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QStandardPaths>
-#include <QtGui/QGuiApplication>
+
 #include <QtQml/QQmlApplicationEngine>
-#include <QtQml/QQmlContext>
+#include <QtAGLExtras/AGLApplication>
 #include <QtQml/qqml.h>
-#include <QtQuickControls2/QQuickStyle>
-#include <QtQuick/qquickitem.h>
-#include <QtQuick/qquickview.h>
-
-#include "pacontrolmodel.h"
 
-#ifdef HAVE_LIBHOMESCREEN
-#include <libhomescreen.hpp>
-#endif
+#include "mixer.hpp"
+#include "audiorole.hpp"
 
 int main(int argc, char *argv[])
 {
-#ifdef HAVE_LIBHOMESCREEN
-       LibHomeScreen libHomeScreen;
-
-       if (!libHomeScreen.renderAppToAreaAllowed(0, 1)) {
-               qWarning() << "renderAppToAreaAllowed is denied";
-               return -1;
-       }
-#endif
-
-       QGuiApplication app(argc, argv);
-
-       QQuickStyle::setStyle("AGL");
-
-       qmlRegisterType<PaControlModel>("PaControlModel", 1, 0, "PaControlModel");
+        AGLApplication app(argc, argv);
+        app.setApplicationName("Mixer");
+        app.setupApplicationRole("mixer");
 
-       QQmlApplicationEngine engine;
-       engine.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));
+        qmlRegisterType<Mixer>("Mixer", 1, 0, "Mixer");
+        app.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));
+        return app.exec();
 
-       return app.exec();
 }