X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui.cc;h=dc9018fc62fe3db41e2ee50018242bb82686471c;hb=fbfa0acebe01e85629c415bec849ca36324c56b1;hp=556dee99feaa4d3d0e0237341b6db8a2b7bb7607;hpb=bf408d60c896d1a072a353f79269ac3bc1600464;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 556dee99fe..dc9018fc62 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -396,7 +396,7 @@ ARDOUR_UI::create_engine ()
 	loading_message (_("Starting audio engine"));
 
 	try {
-		engine = new ARDOUR::AudioEngine (ARDOUR_COMMAND_LINE::jack_client_name, ARDOUR_COMMAND_LINE::jack_session_uuid);
+		engine = ARDOUR::AudioEngine::create (ARDOUR_COMMAND_LINE::backend_client_name, ARDOUR_COMMAND_LINE::backend_session_uuid);
 
 	} catch (...) {
 
@@ -487,7 +487,7 @@ ARDOUR_UI::post_engine ()
 
 	update_disk_space ();
 	update_cpu_load ();
-	update_sample_rate (engine->frame_rate());
+	update_sample_rate (engine->sample_rate());
 	update_timecode_format ();
 
 	Config->ParameterChanged.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::parameter_changed, this, _1), gui_context());
@@ -923,7 +923,7 @@ If you still wish to quit, please use the\n\n\
 		_session = 0;
 	}
 
-	engine->stop (true);
+	engine->stop ();
 	quit ();
 }
 
@@ -1049,16 +1049,16 @@ ARDOUR_UI::update_sample_rate (framecnt_t)
 
 	} else {
 
-		framecnt_t rate = engine->frame_rate();
+		framecnt_t rate = engine->sample_rate();
 
 		if (fmod (rate, 1000.0) != 0.0) {
 			snprintf (buf, sizeof (buf), _("JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"),
-				  (float) rate/1000.0f,
-				  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
+				  (float) rate / 1000.0f,
+				  (engine->usecs_per_cycle() / 1000.0f));
 		} else {
 			snprintf (buf, sizeof (buf), _("JACK: <span foreground=\"green\">%" PRId64 " kHz / %4.1f ms</span>"),
 				  rate/1000,
-				  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
+				  (engine->usecs_per_cycle() * 1000.0f));
 		}
 	}
 
@@ -2044,7 +2044,7 @@ ARDOUR_UI::engine_running ()
 	Glib::RefPtr<Action> action;
 	const char* action_name = 0;
 
-	switch (engine->frames_per_cycle()) {
+	switch (engine->samples_per_cycle()) {
 	case 32:
 		action_name = X_("JACKLatency32");
 		break;
@@ -3817,7 +3817,7 @@ void
 ARDOUR_UI::disconnect_from_jack ()
 {
 	if (engine) {
-		if (engine->disconnect_from_jack ()) {
+		if (engine->pause ()) {
 			MessageDialog msg (*editor, _("Could not disconnect from JACK"));
 			msg.run ();
 		}
@@ -3830,7 +3830,7 @@ void
 ARDOUR_UI::reconnect_to_jack ()
 {
 	if (engine) {
-		if (engine->reconnect_to_jack ()) {
+		if (engine->start ()) {
 			MessageDialog msg (*editor,  _("Could not reconnect to JACK"));
 			msg.run ();
 		}