X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmixer.cpp;h=082ca123eb7b5d733217f88fde4182ff1a1c5533;hb=refs%2Ftags%2Fhalibut%2F8.0.4;hp=66279874820163816cd65236a5893dfce0660d81;hpb=1b8ad361e3955ee469a38486a715bc0dc615c59f;p=apps%2Fmixer.git diff --git a/app/mixer.cpp b/app/mixer.cpp index 6627987..082ca12 100644 --- a/app/mixer.cpp +++ b/app/mixer.cpp @@ -20,63 +20,83 @@ #include #include #include -#include "mixer.h" +#include "mixer.hpp" + Mixer::Mixer(QObject* parent) - : QObject(parent) + : QObject(parent) { 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"); +void Mixer::open(const QUrl& url) +{ + m_url = url; + TryOpen(); } -QStringList Mixer::roles() const +QList Mixer::roles() const { return m_roles; } -void Mixer::open(const QUrl& url) +void Mixer::setRoleVolume(AudioRole* role) { - m_url = url; - m_client.open(m_url); + if (role == nullptr) return; + + QJsonObject arg; + arg.insert("control", role->Name().toLocal8Bit().data()); + arg.insert("value", QJsonValue(role->Value() / 100.0)); + + m_client.call("audiomixer", "volume", arg); } -void Mixer::onClientConnected() +void Mixer::parseControls(const QJsonValue & v) { - // 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!"; - }); + qDebug() << "got controls: " << v; - // 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(); + for(QObject* role : m_roles) delete role; + m_roles.clear(); + + for (const QJsonValue & av : v.toArray()) { + QString name = av.toObject()["control"].toString(); + int value = static_cast(av.toObject()["volume"].toDouble() * 100); + value = qBound(0, value, 100); + + AudioRole *ar = new AudioRole(name, value); + connect(ar, SIGNAL(ValueChanged()), this, SLOT(onRoleValueChanged())); + m_roles.append(ar); + + qDebug() << "added role: " << ar->Name() + << " value: " << ar->Value(); + } + + emit rolesChanged(); +} + +void Mixer::onClientConnected() +{ + m_client.call("audiomixer", "list_controls", QJsonObject(), [this](bool r, const QJsonValue& v) { + if (r && v.isObject()) { + parseControls(v.toObject()["response"]); } + + QJsonObject arg; + arg.insert("event", "controls_changed"); + m_client.call("audiomixer", "subscribe", arg); + + arg.insert("event", "volume_changed"); + m_client.call("audiomixer", "subscribe", arg); }); } void Mixer::onClientDisconnected() { - qDebug() << "Mixer::onClientDisconnected"; - QTimer::singleShot(1000, this, SLOT(onRetryOpen())); + qDebug() << "Mixer::onClientDisconnected!"; + QTimer::singleShot(1000, this, SLOT(TryOpen())); } void Mixer::onClientError(QAbstractSocket::SocketError se) @@ -84,54 +104,46 @@ 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["role"].toString(); - int volume = data["volume"].toInt(); - m_volumes[role] = volume; - emit volumeChanged(role, volume); + + if (eventName == "audiomixer/controls_changed") { + m_client.call("audiomixer", "list_controls", QJsonObject(), [this](bool r, const QJsonValue& v) { + if (r && v.isObject()) { + parseControls(v.toObject()["response"]); + } + }); + } + else if (eventName == "audiomixer/volume_changed") { + QString name = data.toObject()["control"].toString(); + int value = static_cast(data.toObject()["value"].toDouble() * 100); + value = qBound(0, value, 100); + + for (QObject *o : m_roles) { + AudioRole *ar = static_cast(o); + if (ar->Name() == name) { + ar->BeginUpdate(); + ar->setValue(value); + break; + } + } } } -void Mixer::setVolume(const QString& name, int value) +void Mixer::onRoleValueChanged() { - auto currentVolume = m_volumes.find(name); - if (currentVolume != m_volumes.end() && *currentVolume == value) - return; + AudioRole* role = qobject_cast(QObject::sender()); + if (role == nullptr) 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*/ - }); + /* if the role was not being updated by us, it was modified from the UI, + in which case we have to set it to the backend */ + if (!role->EndUpdate()) + setRoleVolume(role); } -void Mixer::getVolume(const QString& name) +void Mixer::TryOpen() { - 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 = m_volumes.find(name); - if (currentVolume != m_volumes.end() && *currentVolume == newVolume) - return; - - m_volumes[name] = newVolume; - emit volumeChanged(name, newVolume); - } - }); + qDebug() << "Mixer::TryOpen: " << m_url; + m_client.open(m_url); }