ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

remove pointless JACK error message; don't add every track as an automatic bundle, just busses 

git-svn-id: svn://localhost/ardour2/branches/3.0@3841 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2008-09-30 14:34:24 +00:00
parent caa305ed2b
commit 9829cd08fe
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/ardour/audioengine.cc
View File

@ -1212,19 +1212,10 @@ AudioEngine::connect_to_jack (string client_name)
_jack = jack_client_open (jack_client_name.c_str(), options, &status, server_name);
if (_jack == NULL) {
if (status & JackServerFailed) {
error << _("Unable to connect to JACK server") << endmsg;
}
// error message is not useful here
return -1;
}
if (status & JackServerStarted) {
info << _("JACK server started") << endmsg;
}
if (status & JackNameNotUnique) {
jack_client_name = jack_get_client_name (_jack);
}

8
libs/ardour/session.cc
View File

@ -1989,8 +1989,12 @@ Session::add_routes (RouteList& new_routes, bool save)
_control_out = (*x);
}
add_bundle ((*x)->bundle_for_inputs());
add_bundle ((*x)->bundle_for_outputs());
/* only busses get automatic bundles formed */
if (!boost::dynamic_pointer_cast<Track> (*x)) {
add_bundle ((*x)->bundle_for_inputs());
add_bundle ((*x)->bundle_for_outputs());
}
}
if (_control_out && IO::connecting_legal) {