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

diff --git a/libs/ardour/ardour/export_formats_search_path.h b/libs/ardour/ardour/export_formats_search_path.h
index 244af7aa75dc6155ed6e58698d5b9a8543b9b7c6..7b6fcea09b760107ee50a3c00e3f3c4ecaf0e325 100644 (file)
--- a/libs/ardour/ardour/export_formats_search_path.h
+++ b/libs/ardour/ardour/export_formats_search_path.h
@@ -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 ();
 

diff --git a/libs/ardour/export_formats_search_path.cc b/libs/ardour/export_formats_search_path.cc
index 53516be933331047017a6bd5425b7bc02adafa0e..fa93e0a55a3b216985bb32349b7bba6134f1721b 100644 (file)
--- a/libs/ardour/export_formats_search_path.cc
+++ b/libs/ardour/export_formats_search_path.cc
@@ -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;