Merge branch 'master' into windows

libs/backends/jack/jack_audiobackend.cc

@@ -547,8 +547,11 @@ JACKAudioBackend::_start (bool for_latency_measurement)
 	/* Now that we have buffer size and sample rate established, the engine 
 	   can go ahead and do its stuff
 	*/
-	
-	engine.reestablish_ports ();
+
+	if (engine.reestablish_ports ()) {
+		error << _("Could not re-establish ports after connecting to JACK") << endmsg;
+		return -1;
+	}
 
 	if (!jack_port_type_get_buffer_size) {
 		warning << _("This version of JACK is old - you should upgrade to a newer version that supports jack_port_type_get_buffer_size()") << endmsg;

libs/backends/jack/jack_audiobackend.h

@@ -89,7 +89,6 @@ class JACKAudioBackend : public AudioBackend {
     std::string control_app_name () const;
     void launch_control_app ();
 
-    int _start (bool for_latency_measurement);
     int stop ();
     int freewheel (bool);
 
@@ -272,6 +271,9 @@ class JACKAudioBackend : public AudioBackend {
     */
 
     JACKSession* _session;
+
+  protected:
+    int _start (bool for_latency_measurement);
 };
 
 } // namespace

libs/backends/jack/jack_connection.cc

@@ -143,7 +143,12 @@ JackConnection::close ()
 	if (_priv_jack) {	
 		int ret = jack_client_close (_priv_jack);
 		_jack = 0;
+
+		/* If we started JACK, it will be closing down */
+		usleep (500000);
+
 		Disconnected (""); /* EMIT SIGNAL */
+
 		return ret;
 	}