ardour/livetrax
13
0
Fork 0
Code

Very minor tidy-up.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12791 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2012-06-20 01:30:14 +00:00
parent 1173bae7c2
commit 816d3da840
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/audioengine.cc
View File

@ -1293,9 +1293,7 @@ AudioEngine::connect_to_jack (string client_name, string session_uuid)
{ {
EnvironmentalProtectionAgency* global_epa = EnvironmentalProtectionAgency::get_global_epa (); EnvironmentalProtectionAgency* global_epa = EnvironmentalProtectionAgency::get_global_epa ();
boost::scoped_ptr<EnvironmentalProtectionAgency> current_epa; boost::scoped_ptr<EnvironmentalProtectionAgency> current_epa;
jack_options_t options = JackNullOption;
jack_status_t status; jack_status_t status;
const char *server_name = NULL;
/* revert all environment settings back to whatever they were when ardour started /* revert all environment settings back to whatever they were when ardour started
*/ */
@ -1311,7 +1309,7 @@ AudioEngine::connect_to_jack (string client_name, string session_uuid)
_jack = jack_client_open (jack_client_name.c_str(), JackSessionID, &status, session_uuid.c_str()); _jack = jack_client_open (jack_client_name.c_str(), JackSessionID, &status, session_uuid.c_str());
else else
#endif #endif
_jack = jack_client_open (jack_client_name.c_str(), options, &status, server_name); _jack = jack_client_open (jack_client_name.c_str(), JackNullOption, &status, 0);
if (_jack == NULL) { if (_jack == NULL) {
// error message is not useful here // error message is not useful here