#include "pbd/file_utils.h"
#include "pbd/types_convert.h"
+#include "ardour/filesystem_paths.h"
#include "ardour/session_directory.h"
#include "ardour_ui.h"
#include "utils_videotl.h"
#include "rgb_macros.h"
#include "video_timeline.h"
-#include "video_tool_paths.h"
#include <gtkmm2ext/utils.h>
#include <pthread.h>
xjadeo_version = "";
version_check.ReadStdout.connect_same_thread (*this, boost::bind (&VideoTimeLine::xjadeo_readversion, this, _1 ,_2));
version_check.Terminated.connect_same_thread (*this, boost::bind (&VideoTimeLine::xjadeo_readversion, this, "\n" ,1));
- if (version_check.start(2)) {
+ if (version_check.start (ARDOUR::SystemExec::MergeWithStdin)) {
warning << _(
"Video-monitor 'xjadeo' cannot be launched."
) << endmsg;
harvid_version = "";
version_check.ReadStdout.connect_same_thread (*this, boost::bind (&VideoTimeLine::harvid_readversion, this, _1 ,_2));
version_check.Terminated.connect_same_thread (*this, boost::bind (&VideoTimeLine::harvid_readversion, this, "\n" ,1));
- if (version_check.start(2)) {
+ if (version_check.start (ARDOUR::SystemExec::MergeWithStdin)) {
return;
}