Merge lp:~xavi-garcia-mena/indicator-sound/lp-1478506-use-role-volume into lp:indicator-sound/15.10

[Xavi Garcia]

Adding changes to use the current role volume instead of getting it from pulse.

Adding changes to use the current role volume instead of getting it from pulse.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks for working on that, I'm just curious but what's the issue with getting it from pulse? Is pulse giving a wrong information? If so why?

[Xavi Garcia (xavi-garcia-mena)]

Hi Sebastien,

At that point, and only for the "Maroon in trouble" game, I get 100% volume even it is using the multimedia role and that we had set a different volume for that role previously.
For other apps the volume obtained is correct.

I don't know if it has relation with the fact that the sounds played are very short...

I've opened a bug to see if we can get a response.

https://bugs.launchpad.net/ubuntu/+source/pulseaudio/+bug/1485522

Unmerged revisions

501. By Xavi Garcia on 2015-08-13

Use the current role volume when addng a sink

=== modified file 'src/volume-control-pulse.vala'
--- src/volume-control-pulse.vala	2015-08-07 03:11:56 +0000
+++ src/volume-control-pulse.vala	2015-08-13 18:31:15 +0000
@@ -52,6 +52,7 @@
 	 * releasing the current active one (restoring back to the previous known role) */
 	private Gee.ArrayList<uint32> _sink_input_list = new Gee.ArrayList<uint32> ();
 	private HashMap<uint32, string> _sink_input_hash = new HashMap<uint32, string> ();
+	private HashMap<string, PulseAudio.Volume> _role_volume_hash = new HashMap<string, PulseAudio.Volume> ();
 	private bool _pulse_use_stream_restore = false;
 	private int32 _active_sink_input = -1;
 	private string[] _valid_roles = {"multimedia", "alert", "alarm", "phone"};
@@ -297,6 +298,46 @@
 
 		return message;
 	}
+	
+	private async void init_role_volume(string role)
+	{
+		/* Listen for role volume changes from pulse itself (external clients) */
+		try {
+			var builder = new VariantBuilder (new VariantType ("ao"));
+			builder.add ("o", role);
+
+			yield _pconn.call ("org.PulseAudio.Core1", "/org/pulseaudio/core1",
+					"org.PulseAudio.Core1", "ListenForSignal",
+					new Variant ("(sao)", "org.PulseAudio.Ext.StreamRestore1.RestoreEntry.VolumeUpdated", builder),
+					null, DBusCallFlags.NONE, -1);
+		} catch (GLib.Error e) {
+			warning ("unable to listen for pulseaudio dbus signals (%s)", e.message);
+		}
+
+		try {
+			var props_variant = yield _pconn.call ("org.PulseAudio.Ext.StreamRestore1.RestoreEntry",
+					role, "org.freedesktop.DBus.Properties", "Get",
+					new Variant ("(ss)", "org.PulseAudio.Ext.StreamRestore1.RestoreEntry", "Volume"),
+					null, DBusCallFlags.NONE, -1);
+			Variant tmp;
+			props_variant.get ("(v)", out tmp);
+			uint32 type = 0, volume = 0;
+			VariantIter iter = tmp.iterator ();
+			iter.next ("(uu)", &type, &volume);
+
+			_role_volume_hash.set (role, volume);
+		} catch (GLib.Error e) {
+			warning ("unable to get volume for active role %s (%s)", role, e.message);
+		}
+	}
+
+	private async void init_roles_volumes()
+	{
+		init_role_volume(_objp_role_multimedia);
+		init_role_volume(_objp_role_alert);
+		init_role_volume(_objp_role_alarm);
+		init_role_volume(_objp_role_phone);
+	}
 
 	private async void update_active_sink_input (int32 index)
 	{
@@ -320,18 +361,9 @@
 			}
 
 			try {
-				var props_variant = yield _pconn.call ("org.PulseAudio.Ext.StreamRestore1.RestoreEntry",
-						sink_input_objp, "org.freedesktop.DBus.Properties", "Get",
-						new Variant ("(ss)", "org.PulseAudio.Ext.StreamRestore1.RestoreEntry", "Volume"),
-						null, DBusCallFlags.NONE, -1);
-				Variant tmp;
-				props_variant.get ("(v)", out tmp);
-				uint32 type = 0, volume = 0;
-				VariantIter iter = tmp.iterator ();
-				iter.next ("(uu)", &type, &volume);
-
+				double volume = volume_to_double(_role_volume_hash.get (sink_input_objp));
 				var vol = new VolumeControl.Volume();
-				vol.volume = volume_to_double (volume);
+				vol.volume = volume;
 				vol.reason = VolumeControl.VolumeReasons.VOLUME_STREAM_CHANGE;
 				this.volume = vol;
 			} catch (GLib.Error e) {
@@ -597,6 +629,7 @@
 					null, DBusCallFlags.NONE, -1);
 
 			debug ("Set volume to %f on path %s", vol, active_role_objp);
+			_role_volume_hash.set (active_role_objp, double_to_volume(vol));
 		} catch (GLib.Error e) {
 			lock (_pa_volume_sig_count) {
 				_pa_volume_sig_count--;
@@ -718,6 +751,7 @@
 
 		/* Only use stream restore if every used role is available */
 		if (_objp_role_multimedia != null && _objp_role_alert != null && _objp_role_alarm != null && _objp_role_phone != null) {
+			init_roles_volumes();
 			debug ("Using PulseAudio DBUS Stream Restore module");
 			/* Restore volume and update default entry */
 			update_active_sink_input.begin (-1);