smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-20 12:26:07 +01:00
Code Issues Projects Releases Wiki Activity

a few more EPA tweaks to make it do absolutely nothing in the unbundled case

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@8339 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-12-23 14:21:50 +00:00
parent 203257bd6e
commit 19b0b3d01a
4 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/main.cc
View file

@ -273,7 +273,7 @@ fixup_bundle_environment (int argc, char* argv[])
return;
}
global_epa = new EnvironmentalProtectionAgency;
EnvironmentalProtectionAgency::set_global_epa (new EnvironmentalProtectionAgency);
Glib::ustring exec_path = argv[0];
Glib::ustring dir_path = Glib::path_get_dirname (Glib::path_get_dirname (exec_path));

4
libs/ardour/audioengine.cc
View file

@ -1125,12 +1125,14 @@ AudioEngine::connect_to_jack (string client_name)
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
EnvironmentalProtectionAgency current_epa (false);
/* revert all environment settings back to whatever they were when ardour started
*/
if (global_epa) {
current_epa.arm ();
current_epa.save ();
global_epa->restore ();
}

21
libs/pbd/epa.cc
View file

@ -29,14 +29,25 @@ using namespace std;
EnvironmentalProtectionAgency* EnvironmentalProtectionAgency::_global_epa = 0;
EnvironmentalProtectionAgency::EnvironmentalProtectionAgency ()
EnvironmentalProtectionAgency::EnvironmentalProtectionAgency (bool arm)
: _armed (arm)
{
save ();
if (_armed) {
save ();
}
}
EnvironmentalProtectionAgency::~EnvironmentalProtectionAgency()
{
restore ();
if (_armed) {
restore ();
}
}
void
EnvironmentalProtectionAgency::arm ()
{
_armed = true;
}
void
@ -63,9 +74,9 @@ EnvironmentalProtectionAgency::save ()
}
}
void
EnvironmentalProtectionAgency::restore ()
EnvironmentalProtectionAgency::restore () const
{
for (map<string,string>::iterator i = e.begin(); i != e.end(); ++i) {
for (map<string,string>::const_iterator i = e.begin(); i != e.end(); ++i) {
cerr << "Restore [" << i->first << "] = " << i->second << endl;
setenv (i->first.c_str(), i->second.c_str(), 1);
}

6
libs/pbd/pbd/epa.h
View file

@ -27,16 +27,18 @@ namespace PBD {
class EnvironmentalProtectionAgency {
public:
EnvironmentalProtectionAgency ();
EnvironmentalProtectionAgency (bool arm=true);
~EnvironmentalProtectionAgency ();
void restore ();
void arm ();
void save ();
void restore () const;
static EnvironmentalProtectionAgency* get_global_epa () { return _global_epa; }
static void set_global_epa (EnvironmentalProtectionAgency* epa) { _global_epa = epa; }
private:
bool _armed;
std::map<std::string,std::string> e;
static EnvironmentalProtectionAgency* _global_epa;
};