X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudioengine.cc;h=e3c9549663558f0bfcab6b7819229e6a6971e9ec;hb=cf702541274471a5ee7b7c94f58fa4428160e538;hp=2792bd5e6572f6a0b47e3c558428818e7441988a;hpb=8af0757b61990767f2a85e68f535a5af9976fd79;p=ardour.git

diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 2792bd5e65..e3c9549663 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -398,8 +398,6 @@ void
 AudioEngine::set_session (Session *s)
 {
 	if (!session) {
-		s->set_block_size (jack_get_buffer_size (_jack));
-		s->set_frame_rate (jack_get_sample_rate (_jack));
 		session = s;
 	}
 }
@@ -539,7 +537,7 @@ AudioEngine::connect (const string& source, const string& destination)
 		pair<string,string> c (s, d);
 		port_connections.push_back (c);
 	} else {
-		error << compose(_("AudioEngine: cannot connect %1 (%2) to %3 (%4)"), 
+		error << string_compose(_("AudioEngine: cannot connect %1 (%2) to %3 (%4)"), 
 				 source, s, destination, d) 
 		      << endmsg;
 	}
@@ -908,7 +906,7 @@ AudioEngine::connect_to_jack (string client_name)
 			error << _("Unable to connect to JACK server") << endmsg;
 		}
 		
-		error << compose (_("Could not connect to JACK server as  \"%1\""), jack_client_name) <<  endmsg;
+		error << string_compose (_("Could not connect to JACK server as  \"%1\""), jack_client_name) <<  endmsg;
 		return -1;
 	}
 
@@ -988,7 +986,7 @@ AudioEngine::reconnect_to_jack ()
 		short_name = long_name.substr (long_name.find_last_of (':') + 1);
 
 		if (((*i)->port = jack_port_register (_jack, short_name.c_str(), (*i)->type(), (*i)->flags(), 0)) == 0) {
-			error << compose (_("could not reregister %1"), (*i)->name()) << endmsg;
+			error << string_compose (_("could not reregister %1"), (*i)->name()) << endmsg;
 			break;
 		} else {
 		}
@@ -1045,7 +1043,7 @@ AudioEngine::reconnect_to_jack ()
 		
 		if ((err = jack_connect (_jack, (*i).first.c_str(), (*i).second.c_str())) != 0) {
 			if (err != EEXIST) {
-				error << compose (_("could not reconnect %1 and %2 (err = %3)"),
+				error << string_compose (_("could not reconnect %1 and %2 (err = %3)"),
 						  (*i).first, (*i).second, err)
 				      << endmsg;
 			}