ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Use enum for exec stderr parameter (2/2)

Browse Source
This commit is contained in:
Robin Gareus 2019-03-05 19:06:29 +01:00
parent e1ffe7857f
commit a390d8d3ca
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2_ardour/transcode_ffmpeg.cc
View File

@ -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;
}

2
gtk2_ardour/video_monitor.cc
View File

@ -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;

4
gtk2_ardour/video_timeline.cc
View File

@ -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;
}