Merge lp:~larsu/indicator-sound/lp1244386 into lp:indicator-sound/14.04

[Lars Karlitski]

VolumeControl: don't pass vala closures into libpulse

Libpulse's vala bindings don't specify that callbacks passed into some of its functions (e.g., get_server_info) can be called after the function returns. Vala thus frees closure data after these functions return.

This can't easily be fixed in the bindings, because libpulse doesn't provide variants of these functions with destroy_notifies.

This patch works around this problem by only passing non-closure functions into libpulse.

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-sound-ci/67/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

[lp:~larsu/indicator-sound/lp1244386]

396. By Lars Karlitski on 2013-10-28

VolumeControl: don't pass vala closures into libpulse

Libpulse's vala bindings don't specify that callbacks passed into some of its functions (e.g., get_server_info) can be called after the function returns. Vala thus frees closure data after these functions return.

This can't easily be fixed in the bindings, because libpulse doesn't provide variants of these functions with destroy_notifies.

This patch works around this problem by only passing non-closure functions into libpulse. Fixes: https://bugs.launchpad.net/bugs/1244386.

Approved by Charles Kerr, PS Jenkins bot.

=== modified file 'src/volume-control.vala'
--- src/volume-control.vala	2013-10-24 02:55:56 +0000
+++ src/volume-control.vala	2013-10-27 00:49:59 +0000
@@ -128,12 +128,14 @@
 		context.get_server_info (server_info_cb_for_props);
 	}
 
+	private void update_source_get_server_info_cb (PulseAudio.Context c, PulseAudio.ServerInfo? i) {
+		if (i != null)
+			context.get_source_info_by_name (i.default_source_name, source_info_cb);
+	}
+
 	private void update_source ()
 	{
-		context.get_server_info ( (c, i) => {
-			if (i != null)
-				context.get_source_info_by_name (i.default_source_name, source_info_cb);
-		});
+		context.get_server_info (update_source_get_server_info_cb);
 	}
 
 	private void source_output_info_cb (Context c, SourceOutputInfo? i, int eol)
@@ -199,15 +201,25 @@
 			warning( "pa_context_connect() failed: %s\n", PulseAudio.strerror(context.errno()));
 	}
 
+	void sink_info_list_callback_set_mute (PulseAudio.Context context, PulseAudio.SinkInfo? sink, int eol) {
+		if (sink != null)
+			context.set_sink_mute_by_index (sink.index, true, null);
+	}
+
+	void sink_info_list_callback_unset_mute (PulseAudio.Context context, PulseAudio.SinkInfo? sink, int eol) {
+		if (sink != null)
+			context.set_sink_mute_by_index (sink.index, false, null);
+	}
+
 	/* Mute operations */
 	public void set_mute (bool mute)
 	{
 		return_if_fail (context.get_state () == Context.State.READY);
 
-		context.get_sink_info_list ((context, sink, eol) => {
-			if (sink != null)
-				context.set_sink_mute_by_index (sink.index, mute, null);
-		});
+		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);
 	}
 
 	public void toggle_mute ()
@@ -277,19 +289,21 @@
 			mic_volume_changed (_mic_volume);
 	}
 
+	void set_mic_volume_get_server_info_cb (PulseAudio.Context c, PulseAudio.ServerInfo? i) {
+		if (i != null) {
+			unowned CVolume cvol = CVolume ();
+			cvol = vol_set (cvol, 1, double_to_volume (_mic_volume));
+			c.set_source_volume_by_name (i.default_source_name, cvol, set_mic_volume_success_cb);
+		}
+	}
+
 	public void set_mic_volume (double volume)
 	{
 		return_if_fail (context.get_state () == Context.State.READY);
 
 		_mic_volume = volume;
 
-		context.get_server_info ( (c, i) => {
-			if (i != null) {
-				unowned CVolume cvol = CVolume ();
-				cvol = vol_set (cvol, 1, double_to_volume (_mic_volume));
-				c.set_source_volume_by_name (i.default_source_name, cvol, set_mic_volume_success_cb);
-			}
-		});
+		context.get_server_info (set_mic_volume_get_server_info_cb);
 	}
 
 	public double get_volume ()