ardour/livetrax
13
0
Fork 0
Code

Modify 'ardour_config_search_path()' and 'ardour_data_search_path()'

Browse Source 
1) So that the Windows version will use appropriate environment variables (if they exist)
     2) So that we don't exit if the env vars can't be found (we can still return some kind of path so just alert the user)
This commit is contained in:
John Emmas 2014-03-19 13:42:58 +00:00
parent 2952ac05e6
commit 6b92b1787e
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/ardour/filesystem_paths.cc
View File

@ -193,15 +193,13 @@ ardour_config_search_path ()
search_path += user_config_directory();
#ifdef PLATFORM_WINDOWS
search_path += windows_search_path ();
#else
#endif
std::string s = Glib::getenv("ARDOUR_CONFIG_PATH");
if (s.empty()) {
std::cerr << _("ARDOUR_CONFIG_PATH not set in environment - exiting\n");
::exit (1);
std::cerr << _("ARDOUR_CONFIG_PATH not set in environment\n");
} else {
search_path += Searchpath (s);
}
search_path += Searchpath (s);
#endif
}
return search_path;
@ -216,15 +214,13 @@ ardour_data_search_path ()
search_path += user_config_directory();
#ifdef PLATFORM_WINDOWS
search_path += windows_search_path ();
#else
#endif
std::string s = Glib::getenv("ARDOUR_DATA_PATH");
if (s.empty()) {
std::cerr << _("ARDOUR_DATA_PATH not set in environment - exiting\n");
::exit (1);
std::cerr << _("ARDOUR_DATA_PATH not set in environment\n");
} else {
search_path += Searchpath (s);
}
search_path += Searchpath (s);
#endif
}
return search_path;