diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2015-04-19 18:17:02 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2015-04-19 18:17:02 +0200 |
| commit | 6da5f1039ed113dcf11b0347e6d2dbd5432c3d33 (patch) | |
| tree | dd48e39b01ff098c9e1059acceb0b36127f15b37 /daemon/musicmanager.h | |
| parent | 8bb7a35eedd431f707ca6fb9134c35bace8e4b24 (diff) | |
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.
Diffstat (limited to 'daemon/musicmanager.h')
| -rw-r--r-- | daemon/musicmanager.h | 7 |
1 files changed, 6 insertions, 1 deletions
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 <QDBusContext> #include <QDBusServiceWatcher> #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 |