From 8da20a7c3088aee2b04d45feeee8ca0753dc260e Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 17 Apr 2015 16:56:00 +0200 Subject: Test MPRIS volume control to see if the setting changes when we alter it. If it fails, use system volume instead, if enabled by config property. --- daemon/musicmanager.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'daemon/musicmanager.h') diff --git a/daemon/musicmanager.h b/daemon/musicmanager.h index 4ad03a8..087dd2a 100644 --- a/daemon/musicmanager.h +++ b/daemon/musicmanager.h @@ -5,6 +5,7 @@ #include #include #include "watchconnector.h" +#include "settings.h" class MusicManager : public QObject, protected QDBusContext { @@ -12,7 +13,7 @@ class MusicManager : public QObject, protected QDBusContext QLoggingCategory l; public: - explicit MusicManager(WatchConnector *watch, QObject *parent = 0); + explicit MusicManager(WatchConnector *watch, Settings *settings, QObject *parent = 0); virtual ~MusicManager(); private: @@ -33,7 +34,9 @@ private: QString _curService; QVariantMap _curMetadata; QDBusConnection *_pulseBus; + Settings *settings; uint _maxVolume; + bool mprisVolumeWorks; }; #endif // MUSICMANAGER_H -- cgit v1.2.3