Update to trunk and export updates

4 files changed, 90 insertions, 5 deletions

diff --git a/data/com.canonical.indicator.sound.gschema.xml b/data/com.canonical.indicator.sound.gschema.xml
index 102a1db..c34dfd6 100644
--- a/data/com.canonical.indicator.sound.gschema.xml
+++ b/data/com.canonical.indicator.sound.gschema.xml
@@ -48,5 +48,14 @@
         Whether or not to show the sound indicator in the menu bar.
       </description>
     </key>
+    <key name="greeter-export" type="b">
+      <default>true</default>
+      <summary>Whether or not to export the currently playing song to the greeter.</summary>
+      <description>
+        If enabled the sound indicator will export the current player and
+        song to the greeter so that it can be shown if the user is selected
+        and the sound menu is shown.
+      </description>
+    </key>
   </schema>
 </schemalist>
diff --git a/debian/changelog b/debian/changelog
index 16c2828..d878559 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+indicator-sound (12.10.2+14.04.20140320-0ubuntu1) trusty; urgency=low
+
+  [ Lars Uebernickel ]
+  * Scale volume in notifications when allow-amplified-volume is set
+    (LP: #1293163)
+  * Use audio-volume-mute-blocking-panel instead of *-blocked-panel
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Thu, 20 Mar 2014 08:58:30 +0000
+
+indicator-sound (12.10.2+14.04.20140318-0ubuntu1) trusty; urgency=low
+
+  [ Lars Uebernickel ]
+  * Show a red icon in the panel when a sound is playing while mute is
+    on (LP: #1291530)
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Tue, 18 Mar 2014 10:01:01 +0000
+
 indicator-sound (12.10.2+14.04.20140313-0ubuntu1) trusty; urgency=low
 
   [ Lars Uebernickel ]
diff --git a/src/service.vala b/src/service.vala
index 793a91a..1617887 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -47,9 +47,9 @@ public class IndicatorSound.Service: Object {
 			this.volume_control.bind_property ("active-mic", menu, "show-mic-volume", BindingFlags.SYNC_CREATE);
 		});
 
-		if (GLib.Environment.get_user_name() != "lightdm") {
-			accounts_service = new AccountsServiceUser();
-		}
+		/* Setup handling for the greeter-export setting */
+		this.settings.changed["greeter-export"].connect( () => this.build_accountsservice() );
+		build_accountsservice();
 
 		this.sync_preferred_players ();
 		this.settings.changed["interested-media-players"].connect ( () => {
@@ -67,6 +67,22 @@ public class IndicatorSound.Service: Object {
 		sharedsettings.bind ("allow-amplified-volume", this, "allow-amplified-volume", SettingsBindFlags.GET);
 	}
 
+	void build_accountsservice () {
+		this.accounts_service = null;
+
+		/* If we're not exporting, don't build anything */
+		if (!this.settings.get_boolean("greeter-export")) {
+			return;
+		}
+
+		/* If we're on the greeter, don't export */
+		if (GLib.Environment.get_user_name() == "lightdm") {
+			return;
+		}
+
+		this.accounts_service = new AccountsServiceUser();
+	}
+
 	public int run () {
 		if (this.loop != null) {
 			warning ("service is already running");
@@ -118,6 +134,8 @@ public class IndicatorSound.Service: Object {
 	VolumeControl volume_control;
 	MediaPlayerList players;
 	uint player_action_update_id;
+	bool mute_blocks_sound;
+	uint sound_was_blocked_timeout_id;
 	Notify.Notification notification;
 	bool syncing_preferred_players = false;
 	AccountsServiceUser? accounts_service = null;
@@ -147,7 +165,7 @@ public class IndicatorSound.Service: Object {
 				icon = "notification-audio-volume-high";
 
 			this.notification.update ("indicator-sound", "", icon);
-			this.notification.set_hint_int32 ("value", ((int32) (100 * v)).clamp (-1, 101));
+			this.notification.set_hint_int32 ("value", ((int32) (100 * v / this.max_volume)).clamp (-1, 101));
 			try {
 				this.notification.show ();
 			}
@@ -192,7 +210,7 @@ public class IndicatorSound.Service: Object {
 		double volume = this.volume_control.get_volume ();
 		string icon;
 		if (this.volume_control.mute)
-			icon = "audio-volume-muted-panel";
+			icon = this.mute_blocks_sound ? "audio-volume-muted-blocking-panel" : "audio-volume-muted-panel";
 		else if (volume <= 0.0)
 			icon = "audio-volume-low-zero-panel";
 		else if (volume <= 0.3)
@@ -235,6 +253,31 @@ public class IndicatorSound.Service: Object {
 			this.update_root_icon ();
 		});
 
+		this.volume_control.notify["is-playing"].connect( () => {
+			if (!this.volume_control.mute) {
+				this.mute_blocks_sound = false;
+				return;
+			}
+
+			if (this.volume_control.is_playing) {
+				this.mute_blocks_sound = true;
+			}
+			else if (this.mute_blocks_sound) {
+				/* Continue to show the blocking icon five seconds after a player has tried to play something */
+				if (this.sound_was_blocked_timeout_id > 0)
+					Source.remove (this.sound_was_blocked_timeout_id);
+
+				this.sound_was_blocked_timeout_id = Timeout.add_seconds (5, () => {
+					this.mute_blocks_sound = false;
+					this.sound_was_blocked_timeout_id = 0;
+					this.update_root_icon ();
+					return false;
+				});
+			}
+
+			this.update_root_icon ();
+		});
+
 		return mute_action;
 	}
 
diff --git a/src/volume-control.vala b/src/volume-control.vala
index e994922..8f21b60 100644
--- a/src/volume-control.vala
+++ b/src/volume-control.vala
@@ -31,6 +31,7 @@ public class VolumeControl : Object
 
 	private PulseAudio.Context context;
 	private bool   _mute = true;
+	private bool   _is_playing = false;
 	private double _volume = 0.0;
 	private double _mic_volume = 0.0;
 
@@ -97,6 +98,13 @@ public class VolumeControl : Object
 			this.notify_property ("mute");
 		}
 
+		var playing = (i.state == PulseAudio.SinkState.RUNNING);
+		if (_is_playing != playing)
+		{
+			_is_playing = playing;
+			this.notify_property ("is-playing");
+		}
+
 		if (_volume != volume_to_double (i.volume.values[0]))
 		{
 			_volume = volume_to_double (i.volume.values[0]);
@@ -235,6 +243,14 @@ public class VolumeControl : Object
 		}
 	}
 
+	public bool is_playing
+	{
+		get
+		{
+			return this._is_playing;
+		}
+	}
+
 	/* Volume operations */
 	private static PulseAudio.Volume double_to_volume (double vol)
 	{