summaryrefslogtreecommitdiff
path: root/daemon/musicmanager.h
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2015-04-17 16:56:00 +0200
committerAndrew Branson <andrew.branson@cern.ch>2015-04-17 19:11:42 +0200
commit8da20a7c3088aee2b04d45feeee8ca0753dc260e (patch)
tree70dc3a2d091ca82f77a9a20e3ce7f1cddd825526 /daemon/musicmanager.h
parentd9f2e79eff8744bd5bd422133117693d42ee52da (diff)
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.
Diffstat (limited to 'daemon/musicmanager.h')
-rw-r--r--daemon/musicmanager.h5
1 files changed, 4 insertions, 1 deletions
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 <QDBusContext>
#include <QDBusServiceWatcher>
#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