From 2b7ca7a6eeb79e03507abb7a16b0503591d2b064 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 4 Nov 2021 14:35:55 -0400 Subject: Initial rework to run without the app framework Changes: - Remove application framework build scripts, and update the application qmake file to just build a "homescreen" binary and support installing it to /usr/bin. - Remove voice API related code. Some of the associated QML and images for the UI have been retained in case equivalent functionality is re-added in the future. - Remove or stub out various app framework API access for the homescreen and launcher bindings, and comment out usage of the Qt wrappers from libqtappfw (e.g. Bluetooth). The aim is to provide a replacement library or libraries for the latter that provide the same functionality. - Remove the old homescreen API documentation and do an initial update of the build instructions in README.md. Bug-AGL: SPEC-4121 Signed-off-by: Scott Murray Change-Id: Iab979c8e1341f2da0384f88f163a977b03664600 --- homescreen/src/mastervolume.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'homescreen/src/mastervolume.cpp') diff --git a/homescreen/src/mastervolume.cpp b/homescreen/src/mastervolume.cpp index 43beaef..de8d75d 100644 --- a/homescreen/src/mastervolume.cpp +++ b/homescreen/src/mastervolume.cpp @@ -15,7 +15,6 @@ */ #include "mastervolume.h" -#include #include #include @@ -25,17 +24,19 @@ 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 { @@ -47,16 +48,21 @@ void MasterVolume::setVolume(qint32 volume) if (m_volume != volume) { m_volume = volume; +#if 0 QJsonObject arg; 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_CONTROL); m_client.call("audiomixer", "volume", arg, [this](bool r, const QJsonValue& v) { @@ -107,7 +113,4 @@ void MasterVolume::onClientEventReceived(QString name, const QJsonValue& data) } } -void MasterVolume::TryOpen() -{ - m_client.open(m_url); -} +#endif -- cgit 1.2.3-korg