Merge lp:~mterry/indicator-sound/greeter-volume into lp:indicator-sound/14.04

[Michael Terry]

Sync volume and mute settings with AccountsService.

Sync volume and mute settings with AccountsService.

On startup, the volume/mute is grabbed from AS. If the user changes either, AS is informed. If AS changes, we take note.

If the greeter is available, we look at whichever user is selected rather than the current user (i.e. greeter vs user session handling).

This needs https://code.launchpad.net/~mterry/gsettings-ubuntu-touch-schemas/volume/+merge/209158 to land first / with it.

Should fix bug 840777.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:426
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/101/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/40/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~mterry/indicator-sound/greeter-volume]

427. By Michael Terry on 2014-03-04

Remove touch namespace for sound settings

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:427
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/102/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/41/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

I think we should change a few things here.

* I think that a better way to detect if we're on the greeter or not is to check which user we're running as. Just checking to see if a name is owned could get messed up pretty easily. It also means we don't have a race with dbus getting the name owner ever. We know our username at start.

* I'd like to see the accounts service support use the accounts service lib. It seems like a better solution.

* I'd like to see the greeter interface as an object. Vala makes this pretty easy, and it's much better than calling the dbus connection directly.

For the last two I think the easiest way to do them might be to base your branch on:

https://code.launchpad.net/~ted/indicator-sound/greeter-control/+merge/209338

Which sets those up already.

review: Needs Fixing

[lp:~mterry/indicator-sound/greeter-volume]

428. By Michael Terry on 2014-03-13

Merge from trunk

429. By Michael Terry on 2014-03-13

Check XDG_SESSION_CLASS to determine if we're in greeter; use native vala dbus interface for greeter list

430. By Michael Terry on 2014-03-14

Fix bug where we weren't asking for volume settings on startup

[Michael Terry (mterry)]

As discussed on IRC, I don't want to check username because the greeter user is a sysadmin-configurable option. But I can check an environment variable that LightDM sets that can tell us if we are in greeter. That's done.

I made the greeter interface an object.

But on using accounts service lib or a vala interface object for AccountsService, I'm going to give soft pushback. The lib isn't async nor can vala interface objects expose async property getter/setters. And since this is in UI code (like, this code is run when the user moves the volume control), I don't think making sync calls is appropriate.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:430
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/113/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/52/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

The actual variables would still have to be accessed through a DBusProxy, the part that the account service API would give you is the object path to the user object.

[Michael Terry (mterry)]

Yeah, but getting (A) the main Manager proxy and (B) asking it for the object path are both sync operations in the library API.

And once you have the object path, Vala doesn't let you perform async get/set with DBus object properties. (We could define a DBus interface for the org.freedesktop.DBus.Properties interface and use Get()/Set() directly, but that's not buying us much.)

So all in all, I agree it would be prettier code, but we'd be giving up too much.

[Ted Gould (ted)]

review: Approve

=== modified file 'src/volume-control.vala'
--- src/volume-control.vala	2013-11-15 20:55:45 +0000
+++ src/volume-control.vala	2014-03-14 14:49:38 +0000
@@ -1,4 +1,5 @@
 /*
+ * -*- Mode:Vala; indent-tabs-mode:t; tab-width:4; encoding:utf8 -*-
  * Copyright 2013 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,6 +23,13 @@
 [CCode(cname="pa_cvolume_set", cheader_filename = "pulse/volume.h")]
 extern unowned PulseAudio.CVolume? vol_set (PulseAudio.CVolume? cv, uint channels, PulseAudio.Volume v);
 
+[DBus (name="com.canonical.UnityGreeter.List")]
+interface GreeterListInterface : Object
+{
+    public abstract async string get_active_entry () throws IOError;
+    public signal void entry_selected (string entry_name);
+}
+
 public class VolumeControl : Object
 {
 	/* this is static to ensure it being freed after @context (loop does not have ref counting) */
@@ -34,6 +42,11 @@
 	private double _volume = 0.0;
 	private double _mic_volume = 0.0;
 
+	private DBusProxy _user_proxy;
+	private GreeterListInterface _greeter_proxy;
+	private Cancellable _mute_cancellable;
+	private Cancellable _volume_cancellable;
+
 	public signal void volume_changed (double v);
 	public signal void mic_volume_changed (double v);
 
@@ -48,6 +61,10 @@
 		if (loop == null)
 			loop = new PulseAudio.GLibMainLoop ();
 
+		_mute_cancellable = new Cancellable ();
+		_volume_cancellable = new Cancellable ();
+		setup_accountsservice.begin ();
+
 		this.reconnect_to_pulse ();
 	}
 
@@ -212,14 +229,25 @@
 	}
 
 	/* Mute operations */
+	bool set_mute_internal (bool mute)
+	{
+		return_val_if_fail (context.get_state () == Context.State.READY, false);
+
+		if (_mute != mute) {
+			if (mute)
+				context.get_sink_info_list (sink_info_list_callback_set_mute);
+			else
+				context.get_sink_info_list (sink_info_list_callback_unset_mute);
+			return true;
+		} else {
+			return false;
+		}
+	}
+
 	public void set_mute (bool mute)
 	{
-		return_if_fail (context.get_state () == Context.State.READY);
-
-		if (mute)
-			context.get_sink_info_list (sink_info_list_callback_set_mute);
-		else
-			context.get_sink_info_list (sink_info_list_callback_unset_mute);
+		if (set_mute_internal (mute))
+			sync_mute_to_accountsservice.begin (mute);
 	}
 
 	public void toggle_mute ()
@@ -274,13 +302,23 @@
 		context.get_sink_info_by_name (i.default_sink_name, sink_info_set_volume_cb);
 	}
 
+	bool set_volume_internal (double volume)
+	{
+		return_val_if_fail (context.get_state () == Context.State.READY, false);
+
+		if (_volume != volume) {
+			_volume = volume;
+			context.get_server_info (server_info_cb_for_set_volume);
+			return true;
+		} else {
+			return false;
+		}
+	}
+
 	public void set_volume (double volume)
 	{
-		return_if_fail (context.get_state () == Context.State.READY);
-
-		_volume = volume;
-
-		context.get_server_info (server_info_cb_for_set_volume);
+		if (set_volume_internal (volume))
+			sync_volume_to_accountsservice.begin (volume);
 	}
 
 	void set_mic_volume_success_cb (Context c, int success)
@@ -315,4 +353,121 @@
 	{
 		return _mic_volume;
 	}
+
+	/* AccountsService operations */
+	private void accountsservice_props_changed_cb (DBusProxy proxy, Variant changed_properties, string[] invalidated_properties)
+	{
+		Variant volume_variant = changed_properties.lookup_value ("Volume", new VariantType ("d"));
+		if (volume_variant != null) {
+			var volume = volume_variant.get_double ();
+			if (volume >= 0)
+				set_volume_internal (volume);
+		}
+
+		Variant mute_variant = changed_properties.lookup_value ("Muted", new VariantType ("b"));
+		if (mute_variant != null) {
+			var mute = mute_variant.get_boolean ();
+			set_mute_internal (mute);
+		}
+	}
+
+	private async void setup_user_proxy (string? username_in = null)
+	{
+		var username = username_in;
+		_user_proxy = null;
+
+		// Look up currently selected greeter user, if asked
+		if (username == null) {
+			try {
+				username = yield _greeter_proxy.get_active_entry ();
+				if (username == "" || username == null)
+					return;
+			} catch (GLib.Error e) {
+				warning ("unable to find Accounts path for user %s: %s", username, e.message);
+				return;
+			}
+		}
+
+		// Get master AccountsService object
+		DBusProxy accounts_proxy;
+		try {
+			accounts_proxy = yield DBusProxy.create_for_bus (BusType.SYSTEM, DBusProxyFlags.DO_NOT_LOAD_PROPERTIES | DBusProxyFlags.DO_NOT_CONNECT_SIGNALS, null, "org.freedesktop.Accounts", "/org/freedesktop/Accounts", "org.freedesktop.Accounts");
+		} catch (GLib.Error e) {
+			warning ("unable to get greeter proxy: %s", e.message);
+			return;
+		}
+
+		// Find user's AccountsService object
+		try {
+			var user_path_variant = yield accounts_proxy.call ("FindUserByName", new Variant ("(s)", username), DBusCallFlags.NONE, -1);
+			string user_path;
+			user_path_variant.get ("(o)", out user_path);
+			_user_proxy = yield DBusProxy.create_for_bus (BusType.SYSTEM, DBusProxyFlags.GET_INVALIDATED_PROPERTIES, null, "org.freedesktop.Accounts", user_path, "com.ubuntu.AccountsService.Sound");
+		} catch (GLib.Error e) {
+			warning ("unable to find Accounts path for user %s: %s", username, e.message);
+			return;
+		}
+
+		// Get current values and listen for changes
+		_user_proxy.g_properties_changed.connect (accountsservice_props_changed_cb);
+		var props_variant = yield _user_proxy.get_connection ().call (_user_proxy.get_name (), _user_proxy.get_object_path (), "org.freedesktop.DBus.Properties", "GetAll", new Variant ("(s)", _user_proxy.get_interface_name ()), null, DBusCallFlags.NONE, -1);
+		Variant props;
+		props_variant.get ("(@a{sv})", out props);
+		accountsservice_props_changed_cb(_user_proxy, props, null);
+	}
+
+	private void greeter_user_changed (string username)
+	{
+		setup_user_proxy.begin (username);
+	}
+
+	private async void setup_accountsservice ()
+	{
+		if (Environment.get_variable ("XDG_SESSION_CLASS") == "greeter") {
+			try {
+				_greeter_proxy = yield Bus.get_proxy (BusType.SESSION, "com.canonical.UnityGreeter", "/list");
+			} catch (GLib.Error e) {
+				warning ("unable to get greeter proxy: %s", e.message);
+				return;
+			}
+			_greeter_proxy.entry_selected.connect (greeter_user_changed);
+			yield setup_user_proxy ();
+		} else {
+			// We are in a user session.  We just need our own proxy
+			var username = Environment.get_variable ("USER");
+			if (username != "" && username != null) {
+				yield setup_user_proxy (username);
+			}
+		}
+	}
+
+	private async void sync_mute_to_accountsservice (bool mute)
+	{
+		if (_user_proxy == null)
+			return;
+
+		_mute_cancellable.cancel ();
+		_mute_cancellable.reset ();
+
+		try {
+			yield _user_proxy.get_connection ().call (_user_proxy.get_name (), _user_proxy.get_object_path (), "org.freedesktop.DBus.Properties", "Set", new Variant ("(ssv)", _user_proxy.get_interface_name (), "Muted", new Variant ("b", mute)), null, DBusCallFlags.NONE, -1, _mute_cancellable);
+		} catch (GLib.Error e) {
+			warning ("unable to sync mute to AccountsService: %s", e.message);
+		}
+	}
+
+	private async void sync_volume_to_accountsservice (double volume)
+	{
+		if (_user_proxy == null)
+			return;
+
+		_volume_cancellable.cancel ();
+		_volume_cancellable.reset ();
+
+		try {
+			yield _user_proxy.get_connection ().call (_user_proxy.get_name (), _user_proxy.get_object_path (), "org.freedesktop.DBus.Properties", "Set", new Variant ("(ssv)", _user_proxy.get_interface_name (), "Volume", new Variant ("d", volume)), null, DBusCallFlags.NONE, -1, _volume_cancellable);
+		} catch (GLib.Error e) {
+			warning ("unable to sync volume to AccountsService: %s", e.message);
+		}
+	}
 }