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_dependents.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_dependents.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_dependents.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index dc69ce8483..1f8b0ef702 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/gtk2_ardour/ardour_ui_dependents.cc @@ -64,12 +64,8 @@ ARDOUR_UI::setup_keybindings () install_actions (); RedirectBox::register_actions (); - std::string key_binding_file = Glib::getenv(X_("ARDOUR_BINDINGS")); + std::string key_binding_file = ARDOUR::find_config_file("ardour.bindings"); - if(!Glib::file_test(key_binding_file, Glib::FILE_TEST_EXISTS)) key_binding_file = ARDOUR::find_config_file("ardour.bindings"); - - std::cout << "Loading key binding file " << key_binding_file << std::endl; - try { AccelMap::load (key_binding_file); } catch (...) { |