X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=homescreen%2Fsrc%2Fmastervolume.h;h=fbbab4bf178d8ad3d4c873489731b7048328bd9e;hb=e490ff1e1e31b4a837cb8063f7346dc65ffe073e;hp=edcdd8ca4dddc2dac551da77117c90a37d7b1fd6;hpb=fbdd80c3c6fd9b27ce1cbe21941baa8a643050fe;p=apps%2Fhomescreen.git

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