Update VehicleSignals usage

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

diff --git a/homescreen/src/mastervolume.h b/homescreen/src/mastervolume.h
index 645968a..89d763b 100644 (file)
--- a/homescreen/src/mastervolume.h
+++ b/homescreen/src/mastervolume.h
@@ -16,33 +16,31 @@
 
 #include <QtCore/QObject>
 #include <QQmlEngine>
-
-#include <pulse/pulseaudio.h>
+#include "vehiclesignals.h"
 
 class MasterVolume : public QObject
 {
        Q_OBJECT
-               Q_PROPERTY (uint32_t volume READ getVolume WRITE setVolume NOTIFY volumeChanged)
 
-       public:
-               MasterVolume(QObject *parent = 0)
-                       : QObject(parent), m_volume(32768)
-               {
-               }
+public:
+       MasterVolume(QObject* parent = nullptr);
+       ~MasterVolume();
 
-               ~MasterVolume() {}
+       Q_INVOKABLE qint32 getVolume() const;
+       Q_INVOKABLE void setVolume(quint32 val);
+       Q_PROPERTY (uint32_t volume READ getVolume WRITE setVolume NOTIFY VolumeChanged)
 
-               uint32_t getVolume() const { return m_volume; }
-               void setVolume(pa_volume_t volume);
+signals:
+       void VolumeChanged();
 
-       public slots:
-               void changeExternalVolume(int volume);
+private slots:
+       void onConnected();
+       void onGetSuccessResponse(QString path, QString value, QString timestamp);
+       void onSignalNotification(QString path, QString value, QString timestamp);
 
-       signals:
-               void volumeChanged(void);
-               void sliderVolumeChanged(int volume_delta);
-               void externalVolumeChanged(uint32_t volume);
+private:
+       quint32 m_volume;
+       VehicleSignals *m_vs;
 
-       private:
-               uint32_t m_volume;
+       void updateVolume(QString value);
 };