projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
send a slightly more useful message if a control protocol's probe() method fails
[ardour.git]
/
libs
/
ardour
/
system_exec.cc
diff --git
a/libs/ardour/system_exec.cc
b/libs/ardour/system_exec.cc
index 90e729a7f683d51df0f761fb3947ebf942afd6f1..aec89564223511a08834ca51b2e180850d16e010 100644
(file)
--- a/
libs/ardour/system_exec.cc
+++ b/
libs/ardour/system_exec.cc
@@
-19,14
+19,13
@@
*/
#include <glibmm/miscutils.h>
*/
#include <glibmm/miscutils.h>
-#include "pbd/pathscanner.h"
#include "pbd/file_utils.h"
#include "pbd/error.h"
#include "ardour/filesystem_paths.h"
#include "ardour/system_exec.h"
#include "pbd/file_utils.h"
#include "pbd/error.h"
#include "ardour/filesystem_paths.h"
#include "ardour/system_exec.h"
-using namespace ARDOUR;
+namespace ARDOUR {
char * SystemExec::_vfork_exec_wrapper = NULL;
char * SystemExec::_vfork_exec_wrapper = NULL;
@@
-35,11
+34,14
@@
static char *vfork_exec_wrapper_path() {
return NULL;
#else
std::string vfork_exec_wrapper;
return NULL;
#else
std::string vfork_exec_wrapper;
- if (!PBD::find_file_in_search_path (
- PBD::Searchpath(Glib::build_filename(ARDOUR::ardour_dll_directory(), "vfork")),
+ if (!PBD::find_file (
+ PBD::Searchpath(
+ ARDOUR::ardour_dll_directory() // deployed
+ + G_SEARCHPATH_SEPARATOR_S + Glib::build_filename(ARDOUR::ardour_dll_directory(), "vfork") // src, build (ardev, etc)
+ ),
"ardour-exec-wrapper", vfork_exec_wrapper)) {
"ardour-exec-wrapper", vfork_exec_wrapper)) {
- PBD::
warning << "vfork exec wrapper not found..'
" << endmsg;
- return NULL;
+ PBD::
fatal << "vfork exec wrapper 'ardour-exec-wrapper' was not found in $PATH.
" << endmsg;
+ abort(); /*NOTREACHED*/
}
return strdup(vfork_exec_wrapper.c_str());
#endif
}
return strdup(vfork_exec_wrapper.c_str());
#endif
@@
-65,4
+67,16
@@
SystemExec::SystemExec (std::string c, std::string a)
#endif
}
#endif
}
+SystemExec::SystemExec (std::string c, const std::map<char, std::string> subs)
+ : PBD::SystemExec(c, subs)
+{
+#ifndef PLATFORM_WINDOWS
+ if (!_vfork_exec_wrapper) {
+ _vfork_exec_wrapper = vfork_exec_wrapper_path();
+ }
+#endif
+}
+
SystemExec::~SystemExec() { }
SystemExec::~SystemExec() { }
+
+} // namespace ARDOUR