more MTC stuff, including toggleable use of torben's PI controller

git-svn-id: svn://localhost/ardour2/branches/3.0@6265 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 8 insertions, 10 deletions

diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 2e5aea9047..2f344eb8ba 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -136,9 +136,13 @@ _thread_init_callback (void * /*arg*/)
 	*/
 
 	PBD::notify_gui_about_thread_creation (pthread_self(), X_("Audioengine"), 4096);
-#ifdef WITH_JACK_MIDI
 	MIDI::JACK_MidiPort::set_process_thread (pthread_self());
-#endif // WITH_JACK_MIDI
+}
+
+static void
+ardour_jack_error (const char* msg)
+{
+	error << "JACK: " << msg << endmsg;
 }
 
 int
@@ -188,6 +192,8 @@ AudioEngine::start ()
 			jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this);
 		}
 
+		jack_set_error_function (ardour_jack_error);
+
 		if (jack_activate (_priv_jack) == 0) {
 			_running = true;
 			_has_run = true;
@@ -1121,12 +1127,6 @@ AudioEngine::remove_all_ports ()
 	ports.flush ();
 }
 
-static void
-ardour_jack_error (const char* msg)
-{
-	error << "JACK: " << msg << endmsg;
-}
-
 int
 AudioEngine::connect_to_jack (string client_name)
 {
@@ -1148,8 +1148,6 @@ AudioEngine::connect_to_jack (string client_name)
 		jack_client_name = jack_get_client_name (_priv_jack);
 	}
 
-	jack_set_error_function (ardour_jack_error);
-
 	return 0;
 }