From 6da5f1039ed113dcf11b0347e6d2dbd5432c3d33 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Sun, 19 Apr 2015 18:17:02 +0200 Subject: Support option for system volume control Add support for direct PulseAudio volume control instead of through MPRIS, which doesn't currently work. Default enabled, added setting to disable. --- daemon/musicmanager.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'daemon/musicmanager.h') diff --git a/daemon/musicmanager.h b/daemon/musicmanager.h index 14aa6fb..81947e9 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,8 @@ 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: void switchToService(const QString &service); @@ -31,6 +33,9 @@ private: QDBusServiceWatcher *_watcher; QString _curService; QVariantMap _curMetadata; + QDBusConnection *_pulseBus; + Settings *settings; + uint _maxVolume; }; #endif // MUSICMANAGER_H -- cgit v1.2.3