Merge lp:~rsalveti/indicator-sound/making_sure_always_syncing_accountservice into lp:indicator-sound/14.10

Proposed by Ricardo Salveti on 2014-10-10
Status: Merged
Approved by: Ted Gould on 2014-10-10
Approved revision: 457
Merged at revision: 459
Proposed branch: lp:~rsalveti/indicator-sound/making_sure_always_syncing_accountservice
Merge into: lp:indicator-sound/14.10
Diff against target: 27 lines (+3/-0)
1 file modified
src/volume-control.vala (+3/-0)
To merge this branch: bzr merge lp:~rsalveti/indicator-sound/making_sure_always_syncing_accountservice
Reviewer Review Type Date Requested Status
Ted Gould (community) 2014-10-10 Approve on 2014-10-10
PS Jenkins bot (community) continuous-integration Approve on 2014-10-10
Review via email: mp+237890@code.launchpad.net

Commit message

volume-control: making sure we're always in sync with accountservice

Description of the change

volume-control: making sure we're always in sync with accountservice

Syncing volume in the following situations:
1 - volume changed as a consequence of a sink add/remove event;
2 - changed role on touch;
3 - external entity setting up the volume for the active role on touch;

To post a comment you must log in.
457. By Ricardo Salveti on 2014-10-10

volume-control: making sure we're always in sync with accountservice

Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/volume-control.vala'
2--- src/volume-control.vala 2014-10-08 18:17:29 +0000
3+++ src/volume-control.vala 2014-10-10 03:55:22 +0000
4@@ -170,6 +170,7 @@
5 {
6 _volume = volume_to_double (i.volume.max ());
7 volume_changed (_volume);
8+ start_local_volume_timer();
9 }
10 }
11
12@@ -238,6 +239,7 @@
13 /* Someone else changed the volume for this role, reflect on the indicator */
14 _volume = volume_to_double (volume);
15 volume_changed (_volume);
16+ start_local_volume_timer();
17 }
18 }
19 }
20@@ -280,6 +282,7 @@
21
22 _volume = volume_to_double (volume);
23 volume_changed (_volume);
24+ start_local_volume_timer();
25 } catch (GLib.Error e) {
26 warning ("unable to get volume for active role %s (%s)", sink_input_objp, e.message);
27 }

Subscribers

People subscribed via source and target branches