Update VehicleSignals usage

[apps/homescreen.git] / homescreen / src / mastervolume.h

diff --git a/homescreen/src/mastervolume.h b/homescreen/src/mastervolume.h
index e23e8d1..89d763b 100644 (file)
--- a/homescreen/src/mastervolume.h
+++ b/homescreen/src/mastervolume.h
@@ -16,34 +16,31 @@
 
 #include <QtCore/QObject>
 #include <QQmlEngine>
-#include "../helpers/qafbwebsocketclient.h"
+#include "vehiclesignals.h"
 
-class MasterVolume
-       : public QObject
+class MasterVolume : public QObject
 {
        Q_OBJECT
-       Q_PROPERTY (uint32_t volume READ getVolume WRITE setVolume NOTIFY VolumeChanged)
-
-private:
-       QAfbWebsocketClient m_client;
-       QUrl m_url;
-       qint32 m_volume;
 
 public:
        MasterVolume(QObject* parent = nullptr);
-       ~MasterVolume() = default;
+       ~MasterVolume();
 
-       Q_INVOKABLE void open(const QUrl& url);
        Q_INVOKABLE qint32 getVolume() const;
-       Q_INVOKABLE void setVolume(qint32 val);
-
-private slots:
-       void onClientConnected();
-       void onClientDisconnected();
-       void onClientError(QAbstractSocket::SocketError se);
-       void onClientEventReceived(QString name, const QJsonValue& data);
-       void TryOpen();
+       Q_INVOKABLE void setVolume(quint32 val);
+       Q_PROPERTY (uint32_t volume READ getVolume WRITE setVolume NOTIFY VolumeChanged)
 
 signals:
        void VolumeChanged();
+
+private slots:
+       void onConnected();
+       void onGetSuccessResponse(QString path, QString value, QString timestamp);
+       void onSignalNotification(QString path, QString value, QString timestamp);
+
+private:
+       quint32 m_volume;
+       VehicleSignals *m_vs;
+
+       void updateVolume(QString value);
 };