From d2f071d5d8c5c21c4f438bf5a822fbaddb2d97ce Mon Sep 17 00:00:00 2001 From: Loïc Collignon Date: Fri, 23 Feb 2018 13:57:35 +0100 Subject: hack: control master volume using 4a with the homescreen slider MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If527d160f8eacbcfed3df2ab744485995dbe1dc9 Signed-off-by: Loïc Collignon --- homescreen/src/mastervolume.h | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) (limited to 'homescreen/src/mastervolume.h') diff --git a/homescreen/src/mastervolume.h b/homescreen/src/mastervolume.h index 3536e58..402b2e5 100644 --- a/homescreen/src/mastervolume.h +++ b/homescreen/src/mastervolume.h @@ -16,6 +16,10 @@ #include #include +#include + +#include "qafbwsclient.h" +#include "qafbwsmsg.h" class MasterVolume : public QObject @@ -24,24 +28,30 @@ class MasterVolume Q_PROPERTY (uint32_t volume READ getVolume WRITE setVolume NOTIFY volumeChanged) public: - MasterVolume(QObject *parent = 0) - : QObject(parent), m_volume(32768) - { - } + explicit MasterVolume(QObject* parent = nullptr); + ~MasterVolume(); - ~MasterVolume() {} + Q_INVOKABLE void init(quint16 port, QString token); - uint32_t getVolume() const { return m_volume; } - void setVolume(uint32_t volume); + uint32_t getVolume() const; + signals: + void volumeChanged(uint32_t volume); public slots: - void changeExternalVolume(int volume); + void setVolume(uint32_t volume); - signals: - void volumeChanged(void); - void sliderVolumeChanged(int volume_delta); - void externalVolumeChanged(uint32_t volume); + private slots: + void onAfbClientConnected(); + void onAfbClientDisconnected(); + void onCallHalListClosed(); + void onCallCtlGet(); + void onCallCtlSet(); private: uint32_t m_volume; + uint32_t m_volumePending; + QString m_soundcard; + + QAfbWsClient m_client; + QSharedPointer m_call; }; -- cgit 1.2.3-korg