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

removed the following environment variables:

Browse source 
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
This commit is contained in:
Tim Mayberry 2006-03-12 16:19:03 +00:00
parent 670641c3df
commit a8640ec0af
16 changed files with 97 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gtk2_ardour/glade_path.cc
View file

@ -31,15 +31,8 @@
std::string
GladePath::path(const std::string& glade_file)
{
std::string user_glade_dir = Glib::getenv(X_("ARDOUR_GLADE_PATH"));
std::string full_path;
if(!user_glade_dir.empty()) {
full_path = Glib::build_filename(user_glade_dir, glade_file);
if(Glib::file_test(full_path, Glib::FILE_TEST_EXISTS)) return full_path;
}
full_path = ARDOUR::find_data_file(Glib::build_filename("glade",
glade_file));
full_path = ARDOUR::find_data_file(glade_file, "glade");
return full_path;
}