allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

probably fix failure to find export formats in packages

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10888 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2011-12-04 20:05:50 +00:00
parent 6fbd05a77d
commit 7a5a5da953
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/export_dialog.cc
View File

@@ -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 */

2
gtk2_ardour/main.cc
View File

@@ -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";

11
libs/ardour/export_formats_search_path.cc
View File

@@ -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;
}

1
libs/ardour/export_profile_manager.cc
View File

@@ -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 */