smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 09:06:33 +01:00
Code Issues Projects Releases Wiki Activity

merge with master and fix Searchpath conflict

Browse source
This commit is contained in:
Paul Davis 2013-09-12 11:40:56 -04:00
parent 4a6412aebe
commit c985a64d58
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/backends/jack/jack_utils.cc
View file

@ -554,7 +554,7 @@ ARDOUR::set_path_env_for_jack_autostart (const vector<std::string>& dirs)
#ifdef __APPLE__ #ifdef __APPLE__
// push it back into the environment so that auto-started JACK can find it. // push it back into the environment so that auto-started JACK can find it.
// XXX why can't we just expect OS X users to have PATH set correctly? we can't ... // XXX why can't we just expect OS X users to have PATH set correctly? we can't ...
setenv ("PATH", SearchPath(dirs).to_string().c_str(), 1); setenv ("PATH", Searchpath(dirs).to_string().c_str(), 1);
#else #else
/* silence a compiler unused variable warning */ /* silence a compiler unused variable warning */
(void) dirs; (void) dirs;
@ -577,7 +577,7 @@ ARDOUR::get_jack_server_dir_paths (vector<std::string>& server_dir_paths)
server_dir_paths.push_back (Glib::path_get_dirname (execpath)); server_dir_paths.push_back (Glib::path_get_dirname (execpath));
#endif #endif
SearchPath sp(string(g_getenv("PATH"))); Searchpath sp(string(g_getenv("PATH")));
#ifdef WIN32 #ifdef WIN32
gchar *install_dir = g_win32_get_package_installation_directory_of_module (NULL); gchar *install_dir = g_win32_get_package_installation_directory_of_module (NULL);