homescreenhandler: Set the application currently app running

[apps/homescreen.git] / homescreen / src / mastervolume.cpp

diff --git a/homescreen/src/mastervolume.cpp b/homescreen/src/mastervolume.cpp
index 5a6dc9a..de8d75d 100644 (file)
--- a/homescreen/src/mastervolume.cpp
+++ b/homescreen/src/mastervolume.cpp
@@ -15,25 +15,28 @@
  */
 
 #include "mastervolume.h"
-#include <QJsonObject>
 #include <QTimer>
 #include <QtDebug>
 
+#define MASTER_CONTROL "Master Playback"
+
 MasterVolume::MasterVolume(QObject* parent)
        : QObject(parent)
        , m_volume{50}
 {
+#if 0
        connect(&m_client, SIGNAL(connected()), this, SLOT(onClientConnected()));
        connect(&m_client, SIGNAL(disconnected()), this, SLOT(onClientDisconnected()));
        connect(&m_client, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(onClientError(QAbstractSocket::SocketError)));
        connect(&m_client, SIGNAL(eventReceived(QString, const QJsonValue&)), this, SLOT(onClientEventReceived(QString, const QJsonValue&)));
+#endif
 }
 
+#if 0
 void MasterVolume::open(const QUrl& url)
 {
-       m_url = url;
-       TryOpen();
 }
+#endif
 
 qint32 MasterVolume::getVolume() const
 {
@@ -45,17 +48,23 @@ void MasterVolume::setVolume(qint32 volume)
        if (m_volume != volume)
        {
                m_volume = volume;
+#if 0
                QJsonObject arg;
-               arg.insert("control", "Master");
-               arg.insert("value", volume);
+               arg.insert("control", MASTER_CONTROL);
+               double v = (double) volume / 100.0;
+               arg.insert("value", v);
                m_client.call("audiomixer", "volume", arg);
+#endif
        }
 }
 
+#if 0
+
 void MasterVolume::onClientConnected()
 {
+
        QJsonObject arg;
-       arg.insert("control", "Master");
+       arg.insert("control", MASTER_CONTROL);
        m_client.call("audiomixer", "volume", arg, [this](bool r, const QJsonValue& v) {
                if (r && v.isObject()) {
                        int volume = v.toObject()["response"].toObject()["volume"].toDouble() * 100;
@@ -91,7 +100,7 @@ void MasterVolume::onClientEventReceived(QString name, const QJsonValue& data)
        {
                QString ctlName = data.toObject()["control"].toString();
 
-               if (ctlName != "Master")
+               if (ctlName != MASTER_CONTROL)
                        return;
 
                int volume = data.toObject()["value"].toDouble() * 100;
@@ -104,7 +113,4 @@ void MasterVolume::onClientEventReceived(QString name, const QJsonValue& data)
        }
 }
 
-void MasterVolume::TryOpen()
-{
-       m_client.open(m_url);
-}
+#endif