Merge lp:~ted/indicator-sound/silent-mode into lp:~ted/indicator-sound/lp1358340-greeter-data

[Ted Gould]

Show a silent mode checkbox and respond to state in the icon

Silent mode doesn't appear to actually do anything, and I can't figure out who should be doing something about that. But now it shows in the indicator and on the panel.

[lp:~ted/indicator-sound/silent-mode]

458. By Ted Gould on 2014-10-03

Don't represent silent mode in the indicator

459. By Ted Gould on 2014-10-08

Update to current trunk

Unmerged revisions

459. By Ted Gould on 2014-10-08

Update to current trunk

458. By Ted Gould on 2014-10-03

Don't represent silent mode in the indicator

457. By Ted Gould on 2014-10-02

Build the volume control first

456. By Ted Gould on 2014-10-02

Make it a switch

455. By Ted Gould on 2014-10-02

Add a silent mode menu item

454. By Ted Gould on 2014-10-02

Pull complex logic into its own function

453. By Ted Gould on 2014-10-02

Create a silent mode action

452. By Ted Gould on 2014-10-02

Backup the properties with a local value and set the proxy

451. By Ted Gould on 2014-10-02

Use silent mode to determine the icon on the panel

450. By Ted Gould on 2014-10-02

Turn the system sound proxy into a silent mode property

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-09-23 16:18:17 +0000
+++ src/CMakeLists.txt	2014-10-02 21:55:45 +0000
@@ -104,6 +104,7 @@
     mpris2-interfaces
     accounts-service-sound-settings
     accounts-service-privacy-settings
+    accounts-service-system-sound-settings
     greeter-broadcast
 )
 vala_add(indicator-sound-service
@@ -113,6 +114,9 @@
   accounts-service-privacy-settings.vala
 )
 vala_add(indicator-sound-service
+  accounts-service-system-sound-settings.vala
+)
+vala_add(indicator-sound-service
   greeter-broadcast.vala
 )
 

=== added file 'src/accounts-service-system-sound-settings.vala'
--- src/accounts-service-system-sound-settings.vala	1970-01-01 00:00:00 +0000
+++ src/accounts-service-system-sound-settings.vala	2014-10-02 21:55:45 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 © Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
+
+[DBus (name = "com.ubuntu.touch.AccountsService.Sound")]
+public interface AccountsServiceSystemSoundSettings : Object {
+	// properties 
+	public abstract bool silent_mode {owned get; set;}
+}
+

=== modified file 'src/accounts-service-user.vala'
--- src/accounts-service-user.vala	2014-10-01 21:53:31 +0000
+++ src/accounts-service-user.vala	2014-10-02 21:55:45 +0000
@@ -22,12 +22,24 @@
 	Act.User? user = null;
 	AccountsServiceSoundSettings? proxy = null;
 	AccountsServicePrivacySettings? privacyproxy = null;
+	AccountsServiceSystemSoundSettings? syssoundproxy = null;
 	uint timer = 0;
 	MediaPlayer? _player = null;
 	GreeterBroadcast? greeter = null;
 
 	public bool showDataOnGreeter { get; set; }
 
+	bool _silentMode = false;
+	public bool silentMode {
+		get {
+			return _silentMode;
+		}
+		set {
+			if (syssoundproxy != null)
+				syssoundproxy.silent_mode = value;
+		}
+	}
+
 	public MediaPlayer? player {
 		set {
 			this._player = value;
@@ -136,6 +148,14 @@
 				DBusProxyFlags.GET_INVALIDATED_PROPERTIES,
 				null,
 				new_privacy_proxy);
+
+			Bus.get_proxy.begin<AccountsServiceSystemSoundSettings> (
+				BusType.SYSTEM,
+				"org.freedesktop.Accounts",
+				user.get_object_path(),
+				DBusProxyFlags.GET_INVALIDATED_PROPERTIES,
+				null,
+				new_system_sound_proxy);
 		}
 	}
 
@@ -178,6 +198,26 @@
 		}
 	}
 
+	void new_system_sound_proxy (GLib.Object? obj, AsyncResult res) {
+		try {
+			this.syssoundproxy = Bus.get_proxy.end (res);
+
+			(this.syssoundproxy as DBusProxy).g_properties_changed.connect((proxy, changed, invalid) => {
+				var silentvar = changed.lookup_value("SilentMode", new VariantType("b"));
+				if (silentvar != null) {
+					debug("Silent Mode changed");
+					this._silentMode = silentvar.get_boolean();
+					this.notify_property("silentMode");
+				}
+			});
+
+			this.silentMode = this.syssoundproxy.silent_mode;
+		} catch (Error e) {
+			this.syssoundproxy = null;
+			warning("Unable to get proxy to system sound settings: %s", e.message);
+		}
+	}
+
 	void greeter_proxy_new (GLib.Object? obj, AsyncResult res) {
 		try {
 			this.greeter = Bus.get_proxy.end (res);

=== modified file 'src/service.vala'
--- src/service.vala	2014-09-26 19:25:25 +0000
+++ src/service.vala	2014-10-02 21:55:45 +0000
@@ -27,38 +27,39 @@
 
 		this.volume_control = new VolumeControl ();
 
+		/* If we're on the greeter, don't export */
+		if (GLib.Environment.get_user_name() != "lightdm") {
+			this.accounts_service = new AccountsServiceUser();
+
+			this.accounts_service.notify["showDataOnGreeter"].connect(() => {
+				this.export_to_accounts_service = this.accounts_service.showDataOnGreeter;
+				eventually_update_player_actions();
+			});
+
+			this.export_to_accounts_service = this.accounts_service.showDataOnGreeter;
+		}
+
 		this.players = playerlist;
 		this.players.player_added.connect (this.player_added);
 		this.players.player_removed.connect (this.player_removed);
 
 		this.actions = new SimpleActionGroup ();
 		this.actions.add_action_entries (action_entries, this);
+		this.actions.add_action (this.create_silent_mode_action ());
 		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.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));
-		this.menus.insert ("phone_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS | SoundMenu.DisplayFlags.GREETER_PLAYERS));
+		this.menus.insert ("phone_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_SILENT_MODE | SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS | SoundMenu.DisplayFlags.GREETER_PLAYERS));
 		this.menus.insert ("desktop", new SoundMenu ("indicator.desktop-settings", SoundMenu.DisplayFlags.SHOW_MUTE));
-		this.menus.insert ("phone", new SoundMenu ("indicator.phone-settings", SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS));
+		this.menus.insert ("phone", new SoundMenu ("indicator.phone-settings", SoundMenu.DisplayFlags.SHOW_SILENT_MODE | SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS));
 
 		this.menus.@foreach ( (profile, menu) => {
 			this.volume_control.bind_property ("active-mic", menu, "show-mic-volume", BindingFlags.SYNC_CREATE);
 		});
 
-		/* If we're on the greeter, don't export */
-		if (GLib.Environment.get_user_name() != "lightdm") {
-			this.accounts_service = new AccountsServiceUser();
-
-			this.accounts_service.notify["showDataOnGreeter"].connect(() => {
-				this.export_to_accounts_service = this.accounts_service.showDataOnGreeter;
-				eventually_update_player_actions();
-			});
-
-			this.export_to_accounts_service = this.accounts_service.showDataOnGreeter;
-		}
-
 		this.sync_preferred_players ();
 		this.settings.changed["interested-media-players"].connect ( () => {
 			this.sync_preferred_players ();
@@ -226,10 +227,26 @@
 		return icon.serialize ();
 	}
 
+	/* This kinda got complex with both mute and silent mode. So we're
+	   gonna put it into a function */
+	bool user_sound_output () {
+		if (this.volume_control.mute) {
+			return false;
+		}
+
+		if (this.accounts_service != null) {
+			if (this.accounts_service.silentMode) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
 	void update_root_icon () {
 		double volume = this.volume_control.get_volume ();
 		string icon;
-		if (this.volume_control.mute)
+		if (!user_sound_output())
 			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";
@@ -241,7 +258,7 @@
 			icon  = "audio-volume-high-panel";
 
 		string accessible_name;
-		if (this.volume_control.mute) {
+		if (!user_sound_output()) {
 			accessible_name = _("Volume (muted)");
 		} else {
 			int volume_int = (int)(volume * 100);
@@ -257,6 +274,36 @@
 		root_action.set_state (builder.end());
 	}
 
+	Action create_silent_mode_action () {
+		bool silentNow = false;
+		if (this.accounts_service != null) {
+			silentNow = this.accounts_service.silentMode;
+		}
+
+		var silent_action = new SimpleAction.stateful ("silent-mode", null, new Variant.boolean (silentNow));
+
+		/* If we're not dealing with accounts service, we'll just always be out
+		   of silent mode and that's cool. */
+		if (this.accounts_service == null) {
+			return silent_action;
+		}
+
+		this.accounts_service.notify["silentMode"].connect(() => {
+			silent_action.set_state(new Variant.boolean(this.accounts_service.silentMode));
+			this.update_root_icon ();
+		});
+
+		silent_action.activate.connect ((action, param) => {
+			action.change_state (new Variant.boolean (!action.get_state().get_boolean()));
+		});
+
+		silent_action.change_state.connect ((action, val) => {
+			this.accounts_service.silentMode = val.get_boolean();
+		});
+
+		return silent_action;
+	}
+
 	Action create_mute_action () {
 		var mute_action = new SimpleAction.stateful ("mute", null, new Variant.boolean (this.volume_control.mute));
 

=== modified file 'src/sound-menu.vala'
--- src/sound-menu.vala	2014-09-23 15:31:16 +0000
+++ src/sound-menu.vala	2014-10-02 21:55:45 +0000
@@ -24,7 +24,8 @@
 		SHOW_MUTE = 1,
 		HIDE_INACTIVE_PLAYERS = 2,
 		HIDE_PLAYERS = 4,
-		GREETER_PLAYERS = 8
+		GREETER_PLAYERS = 8,
+		SHOW_SILENT_MODE = 16
 	}
 
 	public SoundMenu (string? settings_action, DisplayFlags flags) {
@@ -34,8 +35,15 @@
 		 */
 
 		this.volume_section = new Menu ();
+
 		if ((flags & DisplayFlags.SHOW_MUTE) != 0)
 			volume_section.append (_("Mute"), "indicator.mute");
+		if ((flags & DisplayFlags.SHOW_SILENT_MODE) != 0) {
+			var item = new MenuItem(_("Silent Mode"), "indicator.silent-mode");
+			item.set_attribute("x-canonical-type", "s", "com.canonical.indicator.switch");
+			volume_section.append_item(item);
+		}
+
 		volume_section.append_item (this.create_slider_menu_item ("indicator.volume(0)", 0.0, 1.0, 0.01,
 																  "audio-volume-low-zero-panel",
 																  "audio-volume-high-panel"));