Merge branch 'master' into windows

3 files changed, 13 insertions, 11 deletions

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 88a8a2ae04..2d91bdd4c2 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -178,13 +178,6 @@ Session::pre_engine_init (string fullpath)
 
 	set_history_depth (Config->get_history_depth());
 	
-	if (how_many_dsp_threads () > 1) {
-		/* For now, only create the graph if we are using >1 DSP threads, as
-		   it is a bit slower than the old code with 1 thread.
-		*/
-		_process_graph.reset (new Graph (*this));
-	}
-
         /* default: assume simple stereo speaker configuration */
 
         _speakers->setup_default_speakers (2);
@@ -218,6 +211,13 @@ Session::post_engine_init ()
 	set_block_size (_engine.samples_per_cycle());
 	set_frame_rate (_engine.sample_rate());
 
+	if (how_many_dsp_threads () > 1) {
+		/* For now, only create the graph if we are using >1 DSP threads, as
+		   it is a bit slower than the old code with 1 thread.
+		*/
+		_process_graph.reset (new Graph (*this));
+	}
+
 	n_physical_outputs = _engine.n_physical_outputs ();
 	n_physical_inputs =  _engine.n_physical_inputs ();
 
diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc
index c9bc2ad8ac..b3dbdcae71 100644
--- a/libs/backends/jack/jack_audiobackend.cc
+++ b/libs/backends/jack/jack_audiobackend.cc
@@ -44,8 +44,6 @@ using namespace ARDOUR;
 using namespace PBD;
 using std::string;
 using std::vector;
-using std::cerr;
-using std::endl;
 
 #define GET_PRIVATE_JACK_POINTER(localvar)  jack_client_t* localvar = _jack_connection->jack(); if (!(localvar)) { return; }
 #define GET_PRIVATE_JACK_POINTER_RET(localvar,r) jack_client_t* localvar = _jack_connection->jack(); if (!(localvar)) { return r; }
@@ -780,7 +778,7 @@ JACKAudioBackend::_latency_callback (jack_latency_callback_mode_t mode, void* ar
 int
 JACKAudioBackend::create_process_thread (boost::function<void()> f, pthread_t* thread, size_t stacksize)
 {
-        GET_PRIVATE_JACK_POINTER_RET (_priv_jack, 0);
+        GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1);
         ThreadData* td = new ThreadData (this, f, stacksize);
 
         if (jack_client_create_thread (_priv_jack, thread, jack_client_real_time_priority (_priv_jack),
diff --git a/libs/backends/jack/jack_connection.cc b/libs/backends/jack/jack_connection.cc
index da0127c584..07af4b8ade 100644
--- a/libs/backends/jack/jack_connection.cc
+++ b/libs/backends/jack/jack_connection.cc
@@ -32,6 +32,8 @@ using namespace ARDOUR;
 using namespace PBD;
 using std::string;
 using std::vector;
+using std::cerr;
+using std::endl;
 
 static void jack_halted_callback (void* arg)
 {
@@ -137,7 +139,7 @@ JackConnection::close ()
 {
 	GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
 
-	if (_priv_jack) {
+	if (_priv_jack) {	
 		int ret = jack_client_close (_priv_jack);
 		_jack = 0;
 		Disconnected (""); /* EMIT SIGNAL */
@@ -151,6 +153,7 @@ void
 JackConnection::halted_callback ()
 {
 	_jack = 0;
+	cerr << "JACK HALTED\n";
 	Disconnected ("");
 }
 
@@ -158,6 +161,7 @@ void
 JackConnection::halted_info_callback (jack_status_t /*status*/, const char* reason)
 {
 	_jack = 0;
+	cerr << "JACK HALTED: " << reason << endl;
 	Disconnected (reason);
 }