From 292592932ea18777ad15b3b0c07d17047781cde8 Mon Sep 17 00:00:00 2001
From: Xavi Garcia Mena <xavi.garcia.mena@canonical.com>
Date: Mon, 14 Dec 2015 18:09:24 +0100
Subject: rolling back
 lp:~xavi-garcia-mena/indicator-sound/bug-1512798-reenable-amplified-volume

---
 src/service.vala        | 26 --------------------------
 src/sound-menu.vala     |  2 +-
 src/volume-control.vala |  3 +--
 3 files changed, 2 insertions(+), 29 deletions(-)

(limited to 'src')

diff --git a/src/service.vala b/src/service.vala
index 9127f05..312fec5 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -51,7 +51,6 @@ public class IndicatorSound.Service: Object {
 		                            () => { 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 () );
@@ -107,8 +106,6 @@ public class IndicatorSound.Service: Object {
 			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) => {
@@ -187,28 +184,6 @@ public class IndicatorSound.Service: Object {
 
 	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 },
@@ -220,7 +195,6 @@ public class IndicatorSound.Service: Object {
 	SimpleActionGroup actions;
 	HashTable<string, SoundMenu> menus;
 	Settings settings;
-	Settings sharedsettings;
 	VolumeControl volume_control;
 	MediaPlayerList players;
 	uint player_action_update_id;
diff --git a/src/sound-menu.vala b/src/sound-menu.vala
index bdb8df2..686d3c1 100644
--- a/src/sound-menu.vala
+++ b/src/sound-menu.vala
@@ -398,7 +398,7 @@ public class SoundMenu: Object
 		slider.set_attribute ("max-value", "d", max);
 		slider.set_attribute ("step", "d", step);
 		if (sync_action) {
-			slider.set_attribute ("x-canonical-sync-action", "s", "indicator.volume-sync");
+			slider.set_attribute ("x-canonical-sync-action", "s", "volume-sync");
 		}
 
 		return slider;
diff --git a/src/volume-control.vala b/src/volume-control.vala
index 3431ac3..7117990 100644
--- a/src/volume-control.vala
+++ b/src/volume-control.vala
@@ -55,10 +55,9 @@ public abstract class VolumeControl : Object
 	public virtual VolumeControl.ActiveOutput active_output { get { return VolumeControl.ActiveOutput.SPEAKERS; } }
 	private Volume _volume;
 	private double _pre_clamp_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 _max_volume; } set { _max_volume = value;} }
+	public virtual double max_volume { get { return 1.0; } protected set { } }
 
 	public virtual bool high_volume_approved { get { return false; } protected set { } }
 	public virtual void approve_high_volume() { }
-- 
cgit v1.2.3