diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-06 19:32:23 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-06 19:32:23 +0000 |
| commit | 03c159e0899bcd27336076f832027531353b3af5 (patch) | |
| tree | bc67bad159980dd2759186aa618fe201dd4f2d13 /gtk2_ardour/engine_dialog.cc | |
| parent | d2a70266573df319c65a0478222be0c2c9fd5c19 (diff) | |
remove EPA debug output, and use scoped_ptr<> to make sure we don't change the environment in the non-bundled case
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@8469 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/engine_dialog.cc')
| -rw-r--r-- | gtk2_ardour/engine_dialog.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index d6ec7f2a12..c1719ef9a3 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -3,6 +3,7 @@ #include <fstream> #include <map> +#include <boost/scoped_ptr.hpp> #include <glibmm.h> #include <gtkmm/messagedialog.h> #include <pbd/xml++.h> @@ -562,14 +563,13 @@ bool EngineControl::engine_running () { EnvironmentalProtectionAgency* global_epa = EnvironmentalProtectionAgency::get_global_epa (); - EnvironmentalProtectionAgency current_epa (true); /* will restore settings when we leave scope */ + boost::scoped_ptr<EnvironmentalProtectionAgency> current_epa; /* revert all environment settings back to whatever they were when ardour started */ - cerr << "STarting JACK, global EPA = " << global_epa << endl; - if (global_epa) { + current_epa.reset (new EnvironmentalProtectionAgency(true)); /* will restore settings when we leave scope */ global_epa->restore (); } |