summaryrefslogtreecommitdiff
path: root/daemon/manager.cpp
diff options
context:
space:
mode:
authorTomasz Sterna <tomek@xiaoka.com>2015-04-19 18:49:07 +0200
committerTomasz Sterna <tomek@xiaoka.com>2015-04-19 18:49:07 +0200
commit929fc1263bf54df5120c8551a5b9cecd053d87ea (patch)
treed6293c4a69d8563eff90f76b9eb69a4a42d5a3cb /daemon/manager.cpp
parentec074ada19ed8855a8006ca66c709a8303906932 (diff)
parent6da5f1039ed113dcf11b0347e6d2dbd5432c3d33 (diff)
Merge pull request #50 from abranson/volume
Switch music volume controls to alter the system volume.
Diffstat (limited to 'daemon/manager.cpp')
-rw-r--r--daemon/manager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/daemon/manager.cpp b/daemon/manager.cpp
index 02a4021..567316e 100644
--- a/daemon/manager.cpp
+++ b/daemon/manager.cpp
@@ -16,7 +16,7 @@ Manager::Manager(Settings *settings, QObject *parent) :
bank(new BankManager(watch, upload, apps, this)),
voice(new VoiceCallManager(settings, this)),
notifications(new NotificationManager(settings, this)),
- music(new MusicManager(watch, this)),
+ music(new MusicManager(watch, settings, this)),
datalog(new DataLogManager(watch, this)),
appmsg(new AppMsgManager(apps, watch, this)),
js(new JSKitManager(watch, apps, appmsg, settings, this)),