rework SystemExec - use vfork wrapper (and lots of related stuff)

6 files changed, 13 insertions, 13 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index ecd8872ea3..5a5a39033f 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -52,7 +52,6 @@
 #include "pbd/openuri.h"
 #include "pbd/file_utils.h"
 #include "pbd/localtime_r.h"
-#include "pbd/system_exec.h"
 
 #include "gtkmm2ext/application.h"
 #include "gtkmm2ext/bindings.h"
@@ -81,6 +80,7 @@
 #include "ardour/session_state_utils.h"
 #include "ardour/session_utils.h"
 #include "ardour/slave.h"
+#include "ardour/system_exec.h"
 
 #ifdef WINDOWS_VST_SUPPORT
 #include <fst.h>
@@ -3517,7 +3517,7 @@ ARDOUR_UI::start_video_server (Gtk::Window* float_window, bool popup_msg)
 			delete video_server_process;
 		}
 
-		video_server_process = new SystemExec(icsd_exec, argp);
+		video_server_process = new ARDOUR::SystemExec(icsd_exec, argp);
 		if (video_server_process->start()) {
 			warning << _("Cannot launch the video-server") << endmsg;
 			continue;
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 5aa08797fb..132af1ab82 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -38,7 +38,6 @@
 
 #include "pbd/xml++.h"
 #include "pbd/controllable.h"
-#include "pbd/system_exec.h"
 #include <gtkmm/box.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/label.h>
@@ -64,6 +63,7 @@
 #include "ardour/utils.h"
 #include "ardour/plugin.h"
 #include "ardour/session_handle.h"
+#include "ardour/system_exec.h"
 
 #include "video_timeline.h"
 
@@ -626,7 +626,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
 	static UIConfiguration *ui_config;
 
-	PBD::SystemExec *video_server_process;
+	ARDOUR::SystemExec *video_server_process;
 
 	void handle_locations_change (ARDOUR::Location*);
 
diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc
index 0a622cb690..9e531ca0e9 100644
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -109,7 +109,7 @@ TranscodeFfmpeg::probe ()
 	argp[4] = strdup("-show_streams");
 	argp[5] = strdup(infile.c_str());
 	argp[6] = 0;
-	ffcmd = new SystemExec(ffprobe_exe, argp);
+	ffcmd = new ARDOUR::SystemExec(ffprobe_exe, argp);
 	ffcmd->ReadStdout.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffprobeparse, this, _1 ,_2));
 	ffcmd->Terminated.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffexit, this));
 	if (ffcmd->start(1)) {
@@ -382,7 +382,7 @@ TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf
 	}
 #endif
 
-	ffcmd = new SystemExec(ffmpeg_exe, argp);
+	ffcmd = new ARDOUR::SystemExec(ffmpeg_exe, argp);
 	ffcmd->ReadStdout.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffmpegparse_v, this, _1 ,_2));
 	ffcmd->Terminated.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffexit, this));
 	if (ffcmd->start(2)) {
@@ -430,7 +430,7 @@ TranscodeFfmpeg::extract_audio (std::string outfile, ARDOUR::framecnt_t /*sample
 	}
 #endif
 
-	ffcmd = new SystemExec(ffmpeg_exe, argp);
+	ffcmd = new ARDOUR::SystemExec(ffmpeg_exe, argp);
 	ffcmd->ReadStdout.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffmpegparse_a, this, _1 ,_2));
 	ffcmd->Terminated.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffexit, this));
 	if (ffcmd->start(2)) {
@@ -490,7 +490,7 @@ TranscodeFfmpeg::transcode (std::string outfile, const int outw, const int outh,
 	printf("\n");
 	}
 #endif
-	ffcmd = new SystemExec(ffmpeg_exe, argp);
+	ffcmd = new ARDOUR::SystemExec(ffmpeg_exe, argp);
 	ffcmd->ReadStdout.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffmpegparse_v, this, _1 ,_2));
 	ffcmd->Terminated.connect_same_thread (*this, boost::bind (&TranscodeFfmpeg::ffexit, this));
 	if (ffcmd->start(2)) {
diff --git a/gtk2_ardour/transcode_ffmpeg.h b/gtk2_ardour/transcode_ffmpeg.h
index 3d794ee880..184f37932b 100644
--- a/gtk2_ardour/transcode_ffmpeg.h
+++ b/gtk2_ardour/transcode_ffmpeg.h
@@ -21,7 +21,7 @@
 #define __ardour_transcode_ffmpeg_h__
 
 #include <string>
-#include "pbd/system_exec.h"
+#include "ardour/system_exec.h"
 #include "ardour/types.h"
 
 
@@ -128,7 +128,7 @@ class TranscodeFfmpeg : public sigc::trackable
 #endif
 	protected:
 		std::string infile;
-		PBD::SystemExec  *ffcmd;
+		ARDOUR::SystemExec  *ffcmd;
 
 		bool probe ();
 
diff --git a/gtk2_ardour/video_monitor.cc b/gtk2_ardour/video_monitor.cc
index c04d9bde35..279a3fc995 100644
--- a/gtk2_ardour/video_monitor.cc
+++ b/gtk2_ardour/video_monitor.cc
@@ -47,7 +47,7 @@ VideoMonitor::VideoMonitor (PublicEditor *ed, std::string xjadeo_bin_path)
 	starting = 0;
 	osdmode = 10; // 1: frameno, 2: timecode, 8: box
 
-	process = new SystemExec(xjadeo_bin_path, X_("-R"));
+	process = new ARDOUR::SystemExec(xjadeo_bin_path, X_("-R"));
 	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());
diff --git a/gtk2_ardour/video_monitor.h b/gtk2_ardour/video_monitor.h
index 6614ac9237..d2ab91b3a7 100644
--- a/gtk2_ardour/video_monitor.h
+++ b/gtk2_ardour/video_monitor.h
@@ -22,11 +22,11 @@
 
 #include <string>
 
-#include "pbd/system_exec.h"
 #include "ardour/ardour.h"
 #include "ardour/types.h"
 #include "ardour/session.h"
 #include "ardour/session_handle.h"
+#include "ardour/system_exec.h"
 
 namespace ARDOUR {
 	class Session;
@@ -83,7 +83,7 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p
 
 	protected:
 	PublicEditor *editor;
-	PBD::SystemExec *process;
+	ARDOUR::SystemExec *process;
 	float fps;
 	void parse_output (std::string d, size_t s);
 	void terminated ();