Use ARDOUR_EXPORT_FORMATS_PATH (as set up by the bundle)

and the user home directory (where Ardour writes new
presets) to look for export presets (should fix #4282).


git-svn-id: svn://localhost/ardour2/branches/3.0@10623 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-11-15 18:32:48 +00:00
parent 9355226fdf
commit a7359ed268
2 changed files with 2 additions and 13 deletions

View File

@ -26,11 +26,6 @@ namespace ARDOUR {
/**
* return a SearchPath containing directories in which to look for
* export_formats.
*
* If ARDOUR_EXPORT_FORMATS_PATH is defined then the SearchPath returned
* will contain only those directories specified in it, otherwise it will
* contain the user and system directories which may contain export
* formats.
*/
PBD::SearchPath export_formats_search_path ();

View File

@ -35,15 +35,9 @@ SearchPath
export_formats_search_path ()
{
bool export_path_defined = false;
SearchPath spath_env (Glib::getenv(export_env_variable_name, export_path_defined));
SearchPath spath (Glib::getenv (export_env_variable_name, export_path_defined));
if (export_path_defined) {
return spath_env;
}
SearchPath spath (user_config_directory ());
spath += ardour_module_directory ();
spath += user_config_directory ();
spath.add_subdirectory_to_paths (export_formats_dir_name);
return spath;