From f52fe2483aae720b92878272f052b8fc6605dcd9 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Tue, 11 Aug 2015 15:10:56 -0500
Subject: clamp the volume whenever the 'high volume' confirmation notification
 is open.

---
 src/service.vala | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'src/service.vala')

diff --git a/src/service.vala b/src/service.vala
index 994de30..c8382a5 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -139,6 +139,8 @@ public class IndicatorSound.Service: Object {
 
 		clear_acts_player();
 
+        	stop_clamp_volume_timeout();
+
 		if (this.player_action_update_id > 0) {
 			Source.remove (this.player_action_update_id);
 			this.player_action_update_id = 0;
@@ -416,7 +418,9 @@ public class IndicatorSound.Service: Object {
 	}
 
 	private void update_volume_action_state() {
-		volume_action.set_state(create_volume_action_state());
+		var state = create_volume_action_state();
+		message("updating volume_action state to %s", state.print(true));
+		volume_action.set_state(state);
 	}
 
 	private SimpleAction volume_action;
@@ -445,6 +449,11 @@ public class IndicatorSound.Service: Object {
 			if (reason == VolumeControl.VolumeReasons.USER_KEYPRESS ||
 					reason == VolumeControl.VolumeReasons.DEVICE_OUTPUT_CHANGE)
 				this.update_notification ();
+
+			/* if the volume changes while the "high volume"
+			 * warning dialog is up, clamp to high-volume */
+			if (this.warn_notification.id != 0)
+				this.clamp_volume_soon();
 		});
 
 		this.volume_control.bind_property ("ready", volume_action, "enabled", BindingFlags.SYNC_CREATE);
@@ -598,4 +607,27 @@ public class IndicatorSound.Service: Object {
 
 		this.update_preferred_players ();
 	}
+
+        /** VOLUME CLAMPING **/
+
+        private uint _clamp_volume_timeout = 0;
+
+        private void stop_clamp_volume_timeout() {
+                if (_clamp_volume_timeout != 0) {
+                        Source.remove(_clamp_volume_timeout);
+                        _clamp_volume_timeout = 0;
+                }
+        }
+
+        private void clamp_volume_soon() {
+                const uint interval_msec = 200; /* arbitrary, but works */
+                if (_clamp_volume_timeout == 0)
+                        _clamp_volume_timeout = Timeout.add(interval_msec, clamp_volume_idle);
+        }
+
+        private bool clamp_volume_idle() {
+                _clamp_volume_timeout = 0;
+		volume_control.clamp_to_high_volume();
+                return false; // Source.REMOVE;
+        }
 }
-- 
cgit v1.2.3