summaryrefslogtreecommitdiffstats
path: root/app/mixer.cpp
diff options
context:
space:
mode:
authorLoïc Collignon <loic.collignon@iot.bzh>2018-12-13 09:46:10 +0100
committerLoïc Collignon <loic.collignon@iot.bzh>2018-12-19 18:19:45 +0100
commit73ccc498819462d7de5f549037c3847e1cf0088d (patch)
tree18515a0baef7c45b217aed924b1252e3f504db8b /app/mixer.cpp
parent4674ea3a6f5f37c359ca651edf0aa447226480ad (diff)
Handle the volume_changed event
4A's High Level API now raises event when volume of a role is changed. This handles it by subscribing to the event and update the corresponding slider. Bug: SPEC-2054 Change-Id: I137eaa461f0baa9206ee714c91e3ac998b9b2bf2 Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
Diffstat (limited to 'app/mixer.cpp')
-rw-r--r--app/mixer.cpp140
1 files changed, 89 insertions, 51 deletions
diff --git a/app/mixer.cpp b/app/mixer.cpp
index ccb16d6..21dbc32 100644
--- a/app/mixer.cpp
+++ b/app/mixer.cpp
@@ -18,82 +18,120 @@
#include <QJsonArray>
#include <QJsonObject>
+#include <QTimer>
#include <QtDebug>
#include "mixer.h"
Mixer::Mixer(QObject* parent)
: QObject(parent)
{
- connect(&m_client, SIGNAL(connected()), this, SLOT(onClientConnected()));
+ 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&)));
+
+ m_roles.append("Multimedia");
+ m_roles.append("Navigation");
+ m_roles.append("Emergency");
}
QStringList Mixer::roles() const
{
- return m_roles;
+ return m_roles;
}
-void Mixer::open(const QUrl &url)
+void Mixer::open(const QUrl& url)
{
- m_client.open(url);
+ m_url = url;
+ m_client.open(m_url);
}
void Mixer::onClientConnected()
{
- // Call HAL to populate list
- m_client.call("ahl-4a", "get_roles", QJsonValue(), [this](bool r, const QJsonValue& val) {
- if (r)
- {
- m_roles.clear();
- //BUG: should be able to add this, but not handled right now: m_roles.append("playback");
- QJsonArray cards = val.toObject()["response"].toArray();
- foreach (const QJsonValue& card, cards)
- {
- m_roles.append(card.toString());
- qDebug() << "Mixer::onClientConnected - added this HAL: " << card.toString();
- }
- emit rolesChanged();
- }
- });
+ // Subscribe to 4a events
+ m_client.call("ahl-4a", "subscribe", QJsonValue(), [this](bool r, const QJsonValue& val) {
+ if (r)
+ qDebug() << "Mixer::onClientConnected - subscribed to 4a events!";
+ else
+ qCritical () << "Mixer::onClientConnected - Failed to subscribe to 4a events!";
+ });
+
+ // Call HAL to populate list
+ m_client.call("ahl-4a", "get_roles", QJsonValue(), [this](bool r, const QJsonValue& val) {
+ if (r)
+ {
+ m_roles.clear();
+ //BUG: should be able to add this, but not handled right now: m_roles.append("playback");
+ QJsonArray cards = val.toObject()["response"].toArray();
+ foreach (const QJsonValue& card, cards)
+ {
+ m_roles.append(card.toString());
+ qDebug() << "Mixer::onClientConnected - added this HAL: " << card.toString();
+ }
+ emit rolesChanged();
+ }
+ });
+}
+
+void Mixer::onClientDisconnected()
+{
+ qDebug() << "Mixer::onClientDisconnected";
+ QTimer::singleShot(1000, this, SLOT(onRetryOpen()));
+}
+
+void Mixer::onClientError(QAbstractSocket::SocketError se)
+{
+ qDebug() << "Mixer::onClientError: " << se;
+}
+
+void Mixer::onRetryOpen()
+{
+ m_client.open(m_url);
+}
+
+void Mixer::onClientEventReceived(QString eventName, const QJsonValue& data)
+{
+ qDebug() << "Mixer::onClientEventReceived[" << eventName << "]: " << data;
+ if (eventName == "ahl-4a/volume_changed")
+ {
+ QString role = data.toObject()["role"].toString();
+ int volume = data.toObject()["volume"].toInt();
+ m_volumes[role] = volume;
+ emit volumeChanged(role, volume);
+ }
}
void Mixer::setVolume(const QString& name, int value)
{
- QJsonObject arg;
- arg.insert("action", "volume");
- arg.insert("value", QJsonValue(value));
- m_client.call("ahl-4a", name, arg, [name](bool r, const QJsonValue& v) {
- if (r && v.isObject())
- {
- // TODO: Success, update the slider
- }
- else
- {
- // TODO: Failed, reset the slider to previous value
- }
- });
+ auto currentVolume = m_volumes.find(name);
+ if (currentVolume != m_volumes.end() && *currentVolume == value)
+ return;
+
+ QJsonObject arg;
+ arg.insert("action", "volume");
+ arg.insert("value", QJsonValue(value));
+ m_client.call("ahl-4a", name, arg, [name](bool r, const QJsonValue& v) {
+ /* Nothing to do, events will update sliders*/
+ });
}
void Mixer::getVolume(const QString& name)
{
- QJsonObject arg;
- arg.insert("action", "volume");
- arg.insert("value", QJsonValue("+0")); // FIXME: Hack to get volume: ask for a relative change with a delta of zero
- m_client.call("ahl-4a", name, arg, [this, name](bool r, const QJsonValue& v) {
- if (r && v.isObject())
- {
+ QJsonObject arg;
+ arg.insert("action", "volume");
+ arg.insert("value", QJsonValue("+0")); // FIXME: Hack to get volume: ask for a relative change with a delta of zero
+ m_client.call("ahl-4a", name, arg, [this, name](bool r, const QJsonValue& v) {
+ if (r && v.isObject())
+ {
// TODO: Success, update the slider
- qDebug() << "Volume changed: " << v;
- int newVolume = v.toObject()["response"].toObject()["volnew"].toInt();
- auto currentVolume = volumes_.find(name);
- if (currentVolume != volumes_.end() && *currentVolume == newVolume)
- return;
+ qDebug() << "Volume changed: " << v;
+ int newVolume = v.toObject()["response"].toObject()["volnew"].toInt();
+ auto currentVolume = m_volumes.find(name);
+ if (currentVolume != m_volumes.end() && *currentVolume == newVolume)
+ return;
- volumes_[name] = newVolume;
- emit volumeChanged(name, newVolume);
- }
- else
- {
- // TODO: Failed, what to do ?
- }
- });
+ m_volumes[name] = newVolume;
+ emit volumeChanged(name, newVolume);
+ }
+ });
}