smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-18 19:36:00 +01:00
Code Issues Projects Releases Wiki Activity

fix location of use of EPA objects

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@8334 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-12-23 04:05:29 +00:00
parent f49fd15680
commit c52d875701
1 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

27
libs/ardour/audioengine.cc
View file

@ -672,16 +672,6 @@ AudioEngine::connect (const string& source, const string& destination)
{
GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
EnvironmentalProtectionAgency* global_epa = EnvironmentalProtectionAgency::get_global_epa ();
EnvironmentalProtectionAgency current_epa; // saves current settings and restores on exit from this scope
/* revert all environment settings back to whatever they were when ardour started
*/
if (global_epa) {
global_epa->restore ();
}
string s = make_port_name_non_relative (source);
string d = make_port_name_non_relative (destination);
@ -1134,6 +1124,16 @@ AudioEngine::connect_to_jack (string client_name)
jack_status_t status;
const char *server_name = NULL;
EnvironmentalProtectionAgency* global_epa = EnvironmentalProtectionAgency::get_global_epa ();
EnvironmentalProtectionAgency current_epa; // saves current settings and restores on exit from this scope
/* revert all environment settings back to whatever they were when ardour started
*/
if (global_epa) {
global_epa->restore ();
}
jack_client_name = client_name; /* might be reset below */
_jack = jack_client_open (jack_client_name.c_str(), options, &status, server_name);
@ -1291,13 +1291,6 @@ AudioEngine::reconnect_to_jack ()
return -1;
}
EnvironmentalProtectionAgency* global_epa = EnvironmentalProtectionAgency::get_global_epa ();
EnvironmentalProtectionAgency current_epa; // saves current settings and restores on exit from this scope
if (global_epa) {
global_epa->restore ();
}
if ((err = jack_connect (_priv_jack, (*i).first.c_str(), (*i).second.c_str())) != 0) {
if (err != EEXIST) {
error << string_compose (_("could not reconnect %1 and %2 (err = %3)"),