Merge pull request #50 from abranson/volume

Switch music volume controls to alter the system volume.

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