X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=4921bf2e93f3b81129433fe1c2fd5fb973d0b2d6;hb=refs%2Ftags%2Fhalibut_8.0.3;hp=76e755b1310239daee88ad715c2d9bce506925b4;hpb=3fd71f4b6bc026f2f9054140f7bf612855e45d7d;p=apps%2Fmixer.git

diff --git a/app/main.cpp b/app/main.cpp
index 76e755b..4921bf2 100644
--- 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,63 +16,22 @@
  * limitations under the License.
  */
 
-#include "paclient.h"
-#include "pacontrolmodel.h"
 
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QStandardPaths>
-#include <QtCore/QThread>
-#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>
 
-
-#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");
-
-	// 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;
-	engine.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));
-
-	// Find the instantiated model QObject and connect the signals/slots
-	QList<QObject *> mobjs = engine.rootObjects();
-	PaControlModel *pacm = mobjs.first()->findChild<PaControlModel *>("pacm");
-	QObject::connect(client, SIGNAL(controlAdded(int, QString, int, int, const char *, int)),
-			 pacm, SLOT(addOneControl(int, QString, int, int, const char *, int)));
-	QObject::connect(pacm, SIGNAL(volumeChanged(uint32_t, uint32_t, uint32_t, uint32_t)),
-			client, SLOT(setVolume(uint32_t, uint32_t, uint32_t, uint32_t)));
+        AGLApplication app(argc, argv);
+        app.setApplicationName("Mixer");
+        app.setupApplicationRole("mixer");
 
-	// Initalize PA client
-	client->init();
+        qmlRegisterType<Mixer>("Mixer", 1, 0, "Mixer");
+        app.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));
+        return app.exec();
 
-	return app.exec();
 }