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/main.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/main.cc')
| -rw-r--r-- | gtk2_ardour/main.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 3dd0da9250..14330e2009 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -239,18 +239,13 @@ string which_ui_rcfile () { string rcfile; - char* envvar; - - if ((envvar = getenv("ARDOUR_UI_RC")) == 0) { - rcfile = find_config_file ("ardour2_ui.rc"); - if (rcfile.length() == 0) { - warning << _("Without a UI style file, ardour will look strange.\n Please set ARDOUR_UI_RC to point to a valid UI style file") << endmsg; - } - } else { - rcfile = envvar; - } + rcfile = find_config_file ("ardour2_ui.rc"); + if (rcfile.length() == 0) { + warning << _("Without a UI style file, ardour will look strange.\n Please set ARDOUR_UI_RC to point to a valid UI style file") << endmsg; + } + return rcfile; } |