smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 03:36:32 +01:00
Code Issues Projects Releases Wiki Activity

a few more EPA tweaks (from 2.X)

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8340 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-12-23 14:23:31 +00:00
parent 27ab352f5b
commit 8e201d18a8
3 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/audioengine.cc
View file

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

21
libs/pbd/epa.cc
View file

@ -29,14 +29,25 @@ using namespace std;
EnvironmentalProtectionAgency* EnvironmentalProtectionAgency::_global_epa = 0; EnvironmentalProtectionAgency* EnvironmentalProtectionAgency::_global_epa = 0;
EnvironmentalProtectionAgency::EnvironmentalProtectionAgency () EnvironmentalProtectionAgency::EnvironmentalProtectionAgency (bool arm)
: _armed (arm)
{ {
save (); if (_armed) {
save ();
}
} }
EnvironmentalProtectionAgency::~EnvironmentalProtectionAgency() EnvironmentalProtectionAgency::~EnvironmentalProtectionAgency()
{ {
restore (); if (_armed) {
restore ();
}
}
void
EnvironmentalProtectionAgency::arm ()
{
_armed = true;
} }
void void
@ -63,9 +74,9 @@ EnvironmentalProtectionAgency::save ()
} }
} }
void 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; cerr << "Restore [" << i->first << "] = " << i->second << endl;
setenv (i->first.c_str(), i->second.c_str(), 1); 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 { class EnvironmentalProtectionAgency {
public: public:
EnvironmentalProtectionAgency (); EnvironmentalProtectionAgency (bool arm=true);
~EnvironmentalProtectionAgency (); ~EnvironmentalProtectionAgency ();
void restore (); void arm ();
void save (); void save ();
void restore () const;
static EnvironmentalProtectionAgency* get_global_epa () { return _global_epa; } static EnvironmentalProtectionAgency* get_global_epa () { return _global_epa; }
static void set_global_epa (EnvironmentalProtectionAgency* epa) { _global_epa = epa; } static void set_global_epa (EnvironmentalProtectionAgency* epa) { _global_epa = epa; }
private: private:
bool _armed;
std::map<std::string,std::string> e; std::map<std::string,std::string> e;
static EnvironmentalProtectionAgency* _global_epa; static EnvironmentalProtectionAgency* _global_epa;
}; };