Use enum for exec stderr parameter (2/2)

3 files changed, 7 insertions, 7 deletions

diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc
index a26c7622f5..9030cbfe5d 100644
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -98,7 +98,7 @@ TranscodeFfmpeg::probe ()
 	ffcmd = new ARDOUR::SystemExec(ffprobe_exe, argp);
 	ffcmd->ReadStdout.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffprobeparse, this, _1 ,_2));
 	ffcmd->Terminated.connect (*this, invalidator (*this), boost::bind (&TranscodeFfmpeg::ffexit, this), gui_context());
-	if (ffcmd->start(1)) {
+	if (ffcmd->start (SystemExec::IgnoreAndClose)) {
 		ffexit();
 		return false;
 	}
@@ -386,7 +386,7 @@ TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf
 	ffcmd = new ARDOUR::SystemExec(ffmpeg_exe, argp);
 	ffcmd->ReadStdout.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffmpegparse_v, this, _1 ,_2));
 	ffcmd->Terminated.connect (*this, invalidator (*this), boost::bind (&TranscodeFfmpeg::ffexit, this), gui_context());
-	if (ffcmd->start(2)) {
+	if (ffcmd->start (SystemExec::MergeWithStdin)) {
 		ffexit();
 		return false;
 	}
@@ -434,7 +434,7 @@ TranscodeFfmpeg::extract_audio (std::string outfile, ARDOUR::samplecnt_t /*sampl
 	ffcmd = new ARDOUR::SystemExec(ffmpeg_exe, argp);
 	ffcmd->ReadStdout.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffmpegparse_a, this, _1 ,_2));
 	ffcmd->Terminated.connect (*this, invalidator (*this), boost::bind (&TranscodeFfmpeg::ffexit, this), gui_context());
-	if (ffcmd->start(2)) {
+	if (ffcmd->start (SystemExec::MergeWithStdin)) {
 		ffexit();
 		return false;
 	}
@@ -494,7 +494,7 @@ TranscodeFfmpeg::transcode (std::string outfile, const int outw, const int outh,
 	ffcmd = new ARDOUR::SystemExec(ffmpeg_exe, argp);
 	ffcmd->ReadStdout.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffmpegparse_v, this, _1 ,_2));
 	ffcmd->Terminated.connect (*this, invalidator (*this), boost::bind (&TranscodeFfmpeg::ffexit, this), gui_context());
-	if (ffcmd->start(2)) {
+	if (ffcmd->start (SystemExec::MergeWithStdin)) {
 		ffexit();
 		return false;
 	}
diff --git a/gtk2_ardour/video_monitor.cc b/gtk2_ardour/video_monitor.cc
index d6831e45b7..c94b046372 100644
--- a/gtk2_ardour/video_monitor.cc
+++ b/gtk2_ardour/video_monitor.cc
@@ -76,7 +76,7 @@ VideoMonitor::start ()
 	sync_by_manual_seek = false;
 	if (clock_connection.connected()) { clock_connection.disconnect(); }
 
-	if (process->start(debug_enable?2:1)) {
+	if (process->start (debug_enable ? SystemExec::MergeWithStdin : SystemExec::IgnoreAndClose)) {
 		return false;
 	}
 	return true;
diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index d8bec5e23b..0626a4b9a1 100644
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -726,7 +726,7 @@ VideoTimeLine::find_xjadeo () {
 		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;
@@ -795,7 +795,7 @@ VideoTimeLine::find_harvid () {
 	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;
 	}