diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2006-03-12 16:19:03 +0000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2006-03-12 16:19:03 +0000 |
| commit | a8640ec0af8a477b35ddfd9b83d8704e63edf978 (patch) | |
| tree | 74ef1d33983d911faec6671be963e22f2445e35e /gtk2_ardour/ardour_ui.cc | |
| parent | 670641c3df89af73de36efa5b0a184c2430275b0 (diff) | |
removed the following environment variables:
ARDOUR_GLADE_PATH
ARDOUR_RC
ARDOUR_UI
ARDOUR_UI_RC
ARDOUR_BINDINGS
ARDOUR_COLORS
They have been replaced with just one environment
variable called ARDOUR_PATH which can contain a number
of colon separated paths that are used to find various
configuration and data files. Files located in
ARDOUR_PATH have priority over files in ~/.ardour/ and
in the system path.
Moved two member functions of the Configuration class
into globals.cc as they should of been static and I'm
trying to keep the non-portable code together when it
makes sense.
git-svn-id: svn://localhost/trunk/ardour2@380 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 72bc9948ee..f99d199681 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -131,11 +131,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile) using namespace Gtk::Menu_Helpers; Gtkmm2ext::init(); - - /* actually, its already loaded, but ... */ - - cerr << "Loading UI configuration file " << rcfile << endl; - + about = 0; if (theArdourUI == 0) { @@ -148,12 +144,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile) color_manager = new ColorManager(); - std::string color_file = Glib::getenv(X_("ARDOUR_COLORS")); - if(!Glib::file_test(color_file, Glib::FILE_TEST_EXISTS)) { - color_file = ARDOUR::find_config_file("ardour.colors"); - } - - cerr << "Loading UI color configuration file " << color_file << endl; + std::string color_file = ARDOUR::find_config_file("ardour.colors"); color_manager->load (color_file); @@ -374,8 +365,8 @@ ARDOUR_UI::save_ardour_state () session->add_instant_xml(enode, session->path()); session->add_instant_xml(mnode, session->path()); } else { - Config->add_instant_xml(enode, Config->get_user_ardour_path()); - Config->add_instant_xml(mnode, Config->get_user_ardour_path()); + Config->add_instant_xml(enode, get_user_ardour_path()); + Config->add_instant_xml(mnode, get_user_ardour_path()); } } @@ -2130,7 +2121,7 @@ ARDOUR_UI::mixer_settings () const if (session) { node = session->instant_xml(X_("Mixer"), session->path()); } else { - node = Config->instant_xml(X_("Mixer"), Config->get_user_ardour_path()); + node = Config->instant_xml(X_("Mixer"), get_user_ardour_path()); } if (!node) { @@ -2148,7 +2139,7 @@ ARDOUR_UI::editor_settings () const if (session) { node = session->instant_xml(X_("Editor"), session->path()); } else { - node = Config->instant_xml(X_("Editor"), Config->get_user_ardour_path()); + node = Config->instant_xml(X_("Editor"), get_user_ardour_path()); } if (!node) { |