diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-04 20:05:50 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-04 20:05:50 +0000 |
| commit | 7a5a5da95367860eb6176a52786155e1d0656e77 (patch) | |
| tree | 8a44e4a809be9ebce5ba331fd748d88ae6f4d6a5 /libs/ardour | |
| parent | 6fbd05a77d573ea98f7482220a5e9c0703a2c6d2 (diff) | |
probably fix failure to find export formats in packages
git-svn-id: svn://localhost/ardour2/branches/3.0@10888 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/export_formats_search_path.cc | 11 | ||||
| -rw-r--r-- | libs/ardour/export_profile_manager.cc | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libs/ardour/export_formats_search_path.cc b/libs/ardour/export_formats_search_path.cc index e8b95b69e1..b35d3098f0 100644 --- a/libs/ardour/export_formats_search_path.cc +++ b/libs/ardour/export_formats_search_path.cc @@ -36,12 +36,17 @@ SearchPath export_formats_search_path () { bool export_path_defined = false; - SearchPath spath (Glib::getenv (export_env_variable_name, export_path_defined)); + SearchPath spath; - spath += user_config_directory (); + spath = user_config_directory (); spath.add_subdirectory_to_paths (export_formats_dir_name); - std::cerr << "Looking for export formats in " << spath.to_string() << std::endl; + std::string env_var = Glib::getenv (export_env_variable_name, export_path_defined); + + if (export_path_defined) { + sys::path p = env_var; + spath += p; + } return spath; } diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc index 18886bc573..7eaa7c0632 100644 --- a/libs/ardour/export_profile_manager.cc +++ b/libs/ardour/export_profile_manager.cc @@ -68,7 +68,6 @@ ExportProfileManager::ExportProfileManager (Session & s, std::string xml_node_na search_path += export_formats_search_path(); - cerr << string_compose (_("Searching for export formats in %1"), search_path.to_string()) << endl; info << string_compose (_("Searching for export formats in %1"), search_path.to_string()) << endmsg; /* create export config directory if necessary */ |