diff options
author | Tanu Kaskinen <tanuk@iki.fi> | 2009-06-29 18:35:06 +0300 |
---|---|---|
committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-06-29 18:35:06 +0300 |
commit | 0bc538b08ca5c4efea86700cb6c4685da3f34345 (patch) | |
tree | e5b0fe4b967ecb7e9251faf21904bbbe825aaab7 /src/modules/bluetooth/module-bluetooth-proximity.c | |
parent | b152f3a052eca7225870a7dc4d8a719bee107f0f (diff) | |
parent | 2654eb7781ddcfe53064745bbad77bffe5c8eada (diff) |
Merge branch 'master' into dbus-work
Conflicts:
src/daemon/daemon-conf.c
src/daemon/daemon-conf.h
src/daemon/main.c
src/pulsecore/dbus-util.h
Diffstat (limited to 'src/modules/bluetooth/module-bluetooth-proximity.c')
-rw-r--r-- | src/modules/bluetooth/module-bluetooth-proximity.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/bluetooth/module-bluetooth-proximity.c b/src/modules/bluetooth/module-bluetooth-proximity.c index 9993c8dc..c4cfd733 100644 --- a/src/modules/bluetooth/module-bluetooth-proximity.c +++ b/src/modules/bluetooth/module-bluetooth-proximity.c @@ -109,7 +109,7 @@ static void update_volume(struct userdata *u) { } pa_log_info("Found %u BT devices, unmuting.", u->n_found); - pa_sink_set_mute(s, FALSE); + pa_sink_set_mute(s, FALSE, FALSE); } else if (!u->muted && (u->n_found+u->n_unknown) <= 0) { pa_sink *s; @@ -122,7 +122,7 @@ static void update_volume(struct userdata *u) { } pa_log_info("No BT devices found, muting."); - pa_sink_set_mute(s, TRUE); + pa_sink_set_mute(s, TRUE, FALSE); } else pa_log_info("%u devices now active, %u with unknown state.", u->n_found, u->n_unknown); |