diff options
author | Ted Gould <ted@gould.cx> | 2014-11-05 10:36:40 -0600 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2014-11-05 10:36:40 -0600 |
commit | 3c350eabc0e9eef095933819fc168d8183630eb5 (patch) | |
tree | f48dfc67201d98ec7cc885dfa912c057f00e8572 /src/service.vala | |
parent | ec3a83ffca91bc42c494979f4d686367d85ed216 (diff) | |
parent | 1e193a4b99e62b52fb759d00a8745f1c477d965f (diff) | |
download | ayatana-indicator-sound-3c350eabc0e9eef095933819fc168d8183630eb5.tar.gz ayatana-indicator-sound-3c350eabc0e9eef095933819fc168d8183630eb5.tar.bz2 ayatana-indicator-sound-3c350eabc0e9eef095933819fc168d8183630eb5.zip |
Warn on high audio levels when using headphones (LP: #123633, #1373404)
Diffstat (limited to 'src/service.vala')
-rw-r--r-- | src/service.vala | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/service.vala b/src/service.vala index 4298ad7..7daa6db 100644 --- a/src/service.vala +++ b/src/service.vala @@ -49,6 +49,7 @@ public class IndicatorSound.Service: Object { this.actions.add_action (this.create_mute_action ()); this.actions.add_action (this.create_volume_action ()); this.actions.add_action (this.create_mic_volume_action ()); + this.actions.add_action (this.create_high_volume_actions ()); this.menus = new HashTable<string, SoundMenu> (str_hash, str_equal); this.menus.insert ("desktop_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_MUTE | SoundMenu.DisplayFlags.HIDE_PLAYERS | SoundMenu.DisplayFlags.GREETER_PLAYERS)); @@ -60,6 +61,10 @@ public class IndicatorSound.Service: Object { this.volume_control.bind_property ("active-mic", menu, "show-mic-volume", BindingFlags.SYNC_CREATE); }); + this.menus.@foreach ( (profile, menu) => { + this.volume_control.bind_property ("high-volume", menu, "show-high-volume-warning", BindingFlags.SYNC_CREATE); + }); + this.sync_preferred_players (); this.settings.changed["interested-media-players"].connect ( () => { this.sync_preferred_players (); @@ -174,6 +179,8 @@ public class IndicatorSound.Service: Object { double v = this.volume_control.get_volume () + volume_step_percentage * delta; this.volume_control.set_volume (v.clamp (0.0, this.max_volume)); + /* TODO: Don't want to mess up the desktop today, but we should remove this + scrolling change and merge that into volume control's notification */ if (this.notification != null) { string icon; if (v <= 0.0) @@ -388,6 +395,15 @@ public class IndicatorSound.Service: Object { return volume_action; } + Action create_high_volume_actions () { + var high_volume_action = new SimpleAction.stateful("high-volume", null, new Variant.boolean (this.volume_control.high_volume)); + + this.volume_control.notify["high-volume"].connect( () => + high_volume_action.set_state(new Variant.boolean (this.volume_control.high_volume))); + + return high_volume_action; + } + void bus_acquired (DBusConnection connection, string name) { try { connection.export_action_group ("/com/canonical/indicator/sound", this.actions); |