Merge lp:~xavi-garcia-mena/indicator-sound/bug-1512798-reenable-amplified-volume into lp:indicator-sound/15.10

[Xavi Garcia]

Reenables allow amplified volume.

Reenables allow amplified volume.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:508
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/287/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-amd64-ci/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/63
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/63/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/287/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

LGTM. Thanks Xavi :)

review: Approve

=== modified file 'src/service.vala'
--- src/service.vala	2015-10-02 14:07:44 +0000
+++ src/service.vala	2015-11-10 14:02:00 +0000
@@ -47,6 +47,7 @@
 		                            () => { debug("Notifications name vanshed");  notify_server_caps_checked = false; });
 
 		this.settings = new Settings ("com.canonical.indicator.sound");
+		this.sharedsettings = new Settings ("com.ubuntu.sound");
 
 		this.settings.bind ("visible", this, "visible", SettingsBindFlags.GET);
 		this.notify["visible"].connect ( () => this.update_root_icon () );
@@ -95,6 +96,8 @@
 			this.sync_preferred_players ();
 		});
 
+		sharedsettings.bind ("allow-amplified-volume", this, "allow-amplified-volume", SettingsBindFlags.GET);
+
 		/* Hide the notification when the menu is shown */
 		var shown_action = actions.lookup_action ("indicator-shown") as SimpleAction;
 		shown_action.change_state.connect ((state) => {
@@ -173,6 +176,28 @@
 
 	public bool visible { get; set; }
 
+	public bool allow_amplified_volume {
+		get {
+			return this.volume_control.max_volume > 1.0;
+		}
+
+		set {
+			if (this.allow_amplified_volume == value)
+				return;
+
+			if (value) {
+				/* from pulse/volume.h: #define PA_VOLUME_UI_MAX (pa_sw_volume_from_dB(+11.0)) */
+				this.volume_control.max_volume = (double)PulseAudio.Volume.sw_from_dB(11.0) / PulseAudio.Volume.NORM;
+			}
+			else {
+				this.volume_control.max_volume = 1.0;
+			}
+
+			/* Normalize volume, because the volume action's state is [0.0, 1.0], see create_volume_action() */
+			this.actions.change_action_state ("volume", this.volume_control.volume.volume / this.volume_control.max_volume);
+		}
+	}
+
 	const ActionEntry[] action_entries = {
 		{ "root", null, null, "@a{sv} {}", null },
 		{ "scroll", activate_scroll_action, "i", null, null },
@@ -184,6 +209,7 @@
 	SimpleActionGroup actions;
 	HashTable<string, SoundMenu> menus;
 	Settings settings;
+	Settings sharedsettings;
 	VolumeControl volume_control;
 	MediaPlayerList players;
 	uint player_action_update_id;
 
=== modified file 'src/volume-control.vala'
--- src/volume-control.vala	2015-08-12 14:00:56 +0000
+++ src/volume-control.vala	2015-11-10 14:02:00 +0000
@@ -40,9 +40,10 @@
 	public virtual bool mute { get { return false; } }
 	public virtual bool is_playing { get { return false; } }
 	private Volume _volume;
+	private double _max_volume = 1.0;
 	public virtual Volume volume { get { return _volume; } set { } }
 	public virtual double mic_volume { get { return 0.0; } set { } }
-	public virtual double max_volume { get { return 1.0; } protected set { } }
+	public virtual double max_volume { get { return _max_volume; } set { _max_volume = value;} }
 
 	public virtual bool high_volume_approved { get { return false; } protected set { } }
 	public virtual void approve_high_volume() { }