ardour/livetrax
13
0
Fork 0
Code

Ignore LD-environment for video transcoding and Lua exec

Browse Source
This commit is contained in:
Robin Gareus 2022-04-01 18:15:35 +02:00
parent 8c7157df6c
commit f74b8227c5
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/ardour_ui_video.cc
View File

@ -194,7 +194,7 @@ ARDOUR_UI::start_video_server (Gtk::Window* float_window, bool popup_msg)
delete video_server_process;
}
video_server_process = new ARDOUR::SystemExec(icsd_exec, argp);
video_server_process = new ARDOUR::SystemExec(icsd_exec, argp, true);
if (video_server_process->start()) {
warning << _("Cannot launch the video-server") << endmsg;
continue;

4
gtk2_ardour/luainstance.cc
View File

@ -432,7 +432,7 @@ lua_forkexec (lua_State *L)
}
args[argc] = 0;
ARDOUR::SystemExec* x = new ARDOUR::SystemExec (args[0], args);
ARDOUR::SystemExec* x = new ARDOUR::SystemExec (args[0], args, true);
x->Terminated.connect (_luaexecs, MISSING_INVALIDATOR, boost::bind (&reaper, x), gui_context());
if (x->start()) {
@ -455,7 +455,7 @@ lua_exec (std::string cmd)
args[1] = strdup ("-c");
args[2] = strdup (cmd.c_str());
args[3] = 0;
ARDOUR::SystemExec x ("/bin/sh", args);
ARDOUR::SystemExec x ("/bin/sh", args, true);
if (x.start()) {
return -1;
}

8
gtk2_ardour/transcode_ffmpeg.cc
View File

@ -88,7 +88,7 @@ TranscodeFfmpeg::probe ()
argp[4] = strdup ("-show_streams");
argp[5] = strdup (infile.c_str ());
argp[6] = 0;
ffcmd = new ARDOUR::SystemExec (ffprobe_exe, argp);
ffcmd = new ARDOUR::SystemExec (ffprobe_exe, argp, true);
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 (SystemExec::IgnoreAndClose)) {
@ -401,7 +401,7 @@ TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf
printf ("\n");
}
ffcmd = new ARDOUR::SystemExec (ffmpeg_exe, argp);
ffcmd = new ARDOUR::SystemExec (ffmpeg_exe, argp, true);
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 ());
@ -452,7 +452,7 @@ TranscodeFfmpeg::extract_audio (std::string outfile, ARDOUR::samplecnt_t /*sampl
printf ("\n");
}
ffcmd = new ARDOUR::SystemExec (ffmpeg_exe, argp);
ffcmd = new ARDOUR::SystemExec (ffmpeg_exe, argp, true);
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 ());
@ -524,7 +524,7 @@ TranscodeFfmpeg::transcode (std::string outfile, const int outw, const int outh,
printf ("\n");
}
ffcmd = new ARDOUR::SystemExec (ffmpeg_exe, argp);
ffcmd = new ARDOUR::SystemExec (ffmpeg_exe, argp, true);
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 (SystemExec::MergeWithStdin)) {

2
gtk2_ardour/video_monitor.cc
View File

@ -51,7 +51,7 @@ VideoMonitor::VideoMonitor (PublicEditor *ed, std::string xjadeo_bin_path)
starting = 0;
osdmode = 10; // 1: frameno, 2: timecode, 8: box
process = new ARDOUR::SystemExec(xjadeo_bin_path, X_("-R -J"));
process = new ARDOUR::SystemExec (xjadeo_bin_path, X_("-R -J"), true);
process->ReadStdout.connect_same_thread (*this, boost::bind (&VideoMonitor::parse_output, this, _1 ,_2));
process->Terminated.connect (*this, invalidator (*this), boost::bind (&VideoMonitor::terminated, this), gui_context());
XJKeyEvent.connect (*this, invalidator (*this), boost::bind (&VideoMonitor::forward_keyevent, this, _1), gui_context());

4
gtk2_ardour/video_timeline.cc
View File

@ -723,7 +723,7 @@ VideoTimeLine::find_xjadeo () {
}
if (found_xjadeo ()) {
ARDOUR::SystemExec version_check(_xjadeo_bin, X_("--version"));
ARDOUR::SystemExec version_check (_xjadeo_bin, X_("--version"), true);
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));
@ -792,7 +792,7 @@ VideoTimeLine::find_harvid () {
if (harvid_bin.empty ()) {
return;
}
ARDOUR::SystemExec version_check(harvid_bin, X_("--version"));
ARDOUR::SystemExec version_check (harvid_bin, X_("--version"), true);
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));