Merge lp:~larsu/indicator-sound/reconnect-to-pulse into lp:indicator-sound/13.10

[Lars Karlitski]

Reconnect when pulseaudio terminates (or crashes)

Reconnect when pulseaudio terminates (or crashes)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'src/volume-control.vala'
--- src/volume-control.vala	2013-06-18 19:00:27 +0000
+++ src/volume-control.vala	2013-09-30 12:15:16 +0000
@@ -46,21 +46,7 @@
 		if (loop == null)
 			loop = new PulseAudio.GLibMainLoop ();
 
-		var props = new Proplist ();
-		props.sets (Proplist.PROP_APPLICATION_NAME, "Ubuntu Audio Settings");
-		props.sets (Proplist.PROP_APPLICATION_ID, "com.canonical.settings.sound");
-		props.sets (Proplist.PROP_APPLICATION_ICON_NAME, "multimedia-volume-control");
-		props.sets (Proplist.PROP_APPLICATION_VERSION, "0.1");
-
-		context = new PulseAudio.Context (loop.get_api(), null, props);
-
-		context.set_state_callback (context_state_callback);
-
-		if (context.connect(null, Context.Flags.NOFAIL, null) < 0)
-		{
-			warning( "pa_context_connect() failed: %s\n", PulseAudio.strerror(context.errno()));
-			return;
-		}
+		this.reconnect_to_pulse ();
 	}
 
 	/* PulseAudio logic*/
@@ -153,18 +139,47 @@
 
 	private void context_state_callback (Context c)
 	{
-		if (c.get_state () == Context.State.READY)
-		{
-			c.subscribe (PulseAudio.Context.SubscriptionMask.SINK |
-						 PulseAudio.Context.SubscriptionMask.SOURCE |
-						 PulseAudio.Context.SubscriptionMask.SOURCE_OUTPUT);
-			c.set_subscribe_callback (context_events_cb);
-			update_sink ();
-			update_source ();
-			this.ready = true;
+		switch (c.get_state ()) {
+			case Context.State.READY:
+				c.subscribe (PulseAudio.Context.SubscriptionMask.SINK |
+							 PulseAudio.Context.SubscriptionMask.SOURCE |
+							 PulseAudio.Context.SubscriptionMask.SOURCE_OUTPUT);
+				c.set_subscribe_callback (context_events_cb);
+				update_sink ();
+				update_source ();
+				this.ready = true;
+				break;
+
+			case Context.State.FAILED:
+			case Context.State.TERMINATED:
+				this.reconnect_to_pulse ();
+				break;
+
+			default: 
+				this.ready = false;
+				break;
 		}
-		else
+	}
+
+	void reconnect_to_pulse ()
+	{
+		if (this.ready) {
+			this.context.disconnect ();
+			this.context = null;
 			this.ready = false;
+		}
+
+		var props = new Proplist ();
+		props.sets (Proplist.PROP_APPLICATION_NAME, "Ubuntu Audio Settings");
+		props.sets (Proplist.PROP_APPLICATION_ID, "com.canonical.settings.sound");
+		props.sets (Proplist.PROP_APPLICATION_ICON_NAME, "multimedia-volume-control");
+		props.sets (Proplist.PROP_APPLICATION_VERSION, "0.1");
+
+		this.context = new PulseAudio.Context (loop.get_api(), null, props);
+		this.context.set_state_callback (context_state_callback);
+
+		if (context.connect(null, Context.Flags.NOFAIL, null) < 0)
+			warning( "pa_context_connect() failed: %s\n", PulseAudio.strerror(context.errno()));
 	}
 
 	/* Mute operations */