X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fsrc%2Fmastervolume.cpp;h=de8d75d14195fea651a5a6e694a4e06382dd73b1;hb=8fb557550d4d3a7b799134af672f499531cc407e;hp=5a6dc9aeb99dccf99bcb81ff9b05eec9fd3e437b;hpb=838d62ed32a6cd6d71c72a7b7b272d672bc7e674;p=apps%2Fhomescreen.git

diff --git a/homescreen/src/mastervolume.cpp b/homescreen/src/mastervolume.cpp
index 5a6dc9a..de8d75d 100644
--- 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