diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-06 08:45:49 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-06 08:45:49 -0400 |
commit | eb4066003805407e0217338e3d3d923287cc04af (patch) | |
tree | d445cb3d9ac9d567e6fde8391eb8ba7fdcfb7f2e /libs | |
parent | 67e4f490648243917eda6d5d84e1d6e4986d86c3 (diff) |
fix up export formats search path to correctly locate bundled (or installed) export formats
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/export_formats_search_path.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libs/ardour/export_formats_search_path.cc b/libs/ardour/export_formats_search_path.cc index ed87a56e1a..cf18b14a18 100644 --- a/libs/ardour/export_formats_search_path.cc +++ b/libs/ardour/export_formats_search_path.cc @@ -35,9 +35,16 @@ namespace ARDOUR { SearchPath export_formats_search_path () { - SearchPath spath; - spath += Glib::build_filename (user_config_directory (), export_formats_dir_name); - spath += SearchPath(Glib::getenv (export_env_variable_name)); + SearchPath spath (ardour_data_search_path()); + spath.add_subdirectory_to_paths (export_formats_dir_name); + + bool export_formats_path_defined = false; + SearchPath spath_env (Glib::getenv(export_env_variable_name, export_formats_path_defined)); + + if (export_formats_path_defined) { + spath += spath_env; + } + return spath; } |