projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better names for Soundcloud-related members of ExportHandler
[ardour.git]
/
libs
/
ardour
/
system_exec.cc
diff --git
a/libs/ardour/system_exec.cc
b/libs/ardour/system_exec.cc
index c99863f2e5372a4addff9420f9282f3989d6ed4b..760a9b787805f31c6db223b65540a6503c9afc8e 100644
(file)
--- a/
libs/ardour/system_exec.cc
+++ b/
libs/ardour/system_exec.cc
@@
-31,6
+31,9
@@
using namespace ARDOUR;
char * SystemExec::_vfork_exec_wrapper = NULL;
static char *vfork_exec_wrapper_path() {
char * SystemExec::_vfork_exec_wrapper = NULL;
static char *vfork_exec_wrapper_path() {
+#ifdef PLATFORM_WINDOWS
+ 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")),
std::string vfork_exec_wrapper;
if (!PBD::find_file_in_search_path (
PBD::Searchpath(Glib::build_filename(ARDOUR::ardour_dll_directory(), "vfork")),
@@
-39,22
+42,37
@@
static char *vfork_exec_wrapper_path() {
return NULL;
}
return strdup(vfork_exec_wrapper.c_str());
return NULL;
}
return strdup(vfork_exec_wrapper.c_str());
+#endif
}
SystemExec::SystemExec (std::string c, char ** a)
: PBD::SystemExec(c, a)
{
}
SystemExec::SystemExec (std::string c, char ** a)
: PBD::SystemExec(c, a)
{
+#ifndef PLATFORM_WINDOWS
if (!_vfork_exec_wrapper) {
_vfork_exec_wrapper = vfork_exec_wrapper_path();
}
if (!_vfork_exec_wrapper) {
_vfork_exec_wrapper = vfork_exec_wrapper_path();
}
+#endif
}
SystemExec::SystemExec (std::string c, std::string a)
: PBD::SystemExec(c, a)
{
}
SystemExec::SystemExec (std::string c, std::string a)
: PBD::SystemExec(c, a)
{
+#ifndef PLATFORM_WINDOWS
if (!_vfork_exec_wrapper) {
_vfork_exec_wrapper = vfork_exec_wrapper_path();
}
if (!_vfork_exec_wrapper) {
_vfork_exec_wrapper = vfork_exec_wrapper_path();
}
+#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() { }