probably fix failure to find export formats in packages

git-svn-id: svn://localhost/ardour2/branches/3.0@10888 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index f6b99cb08221a4e09765e18ce0964ade63635ad6..2097b2d15321df8239b57d8b4d83a50af006a045 100644 (file)
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -63,8 +63,6 @@ ExportDialog::set_session (ARDOUR::Session* s)
        handler = _session->get_export_handler ();
        status = _session->get_export_status ();
 
-       std::cerr << "Setting ExportProfileManager\n";
-
        profile_manager.reset (new ExportProfileManager (*_session, xml_node_name));
 
        /* Possibly init stuff in derived classes */

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 6af714a02f1b423e08c8eec972386f8f4514c5c8..63f5a452b359dc789b5a225a2191c52d116753be 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -340,7 +340,7 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
        export_search_path (dir_path, "ARDOUR_PANNER_PATH", "/lib/panners");
        export_search_path (dir_path, "ARDOUR_SURFACES_PATH", "/lib/surfaces");
        export_search_path (dir_path, "ARDOUR_MIDIMAPS_PATH", "/share/midi_maps");
-       export_search_path (dir_path, "ARDOUR_EXPORT_FORMATS_PATH", "/share/export");
+       export_search_path (dir_path, "ARDOUR_EXPORT_FORMATS_PATH", "/share/exports");
 
        path = dir_path;
        path += "/lib/clearlooks";

diff --git a/libs/ardour/export_formats_search_path.cc b/libs/ardour/export_formats_search_path.cc
index e8b95b69e10d84ca2e6f27cd1a3f5a3405e64469..b35d3098f064cf0e6f31b34eb3a9e3eaf7fbb6d5 100644 (file)
--- 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 18886bc573e7ffc47a507c6f19739d6580a449cf..7eaa7c0632a1185ff4486d16dc7d0dee747f446d 100644 (file)
--- 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 */