From 0cecd2f7d5c9876b587fafb596342312261970ba Mon Sep 17 00:00:00 2001 From: Colin Fletcher Date: Mon, 19 May 2014 19:52:32 +0100 Subject: [PATCH] Use libardour SystemExec wrapper in gtk2_ardour #include ardour/system_exec.h where SystemExec is used in gtk2_ardour to get the libardour wrapper class, and remove the include completely where it's no longer required. --- gtk2_ardour/ardour_ui.cc | 1 - gtk2_ardour/transcode_ffmpeg.h | 2 +- gtk2_ardour/video_monitor.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 262e8f990c..fdfdc9fdad 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -123,7 +123,6 @@ typedef uint64_t microseconds_t; #include "video_server_dialog.h" #include "add_video_dialog.h" #include "transcode_video_dialog.h" -#include "pbd/system_exec.h" #include "i18n.h" diff --git a/gtk2_ardour/transcode_ffmpeg.h b/gtk2_ardour/transcode_ffmpeg.h index e25a68da91..ec01112bb3 100644 --- a/gtk2_ardour/transcode_ffmpeg.h +++ b/gtk2_ardour/transcode_ffmpeg.h @@ -21,8 +21,8 @@ #define __ardour_transcode_ffmpeg_h__ #include +#include "ardour/system_exec.h" #include "ardour/types.h" -#include "pbd/system_exec.h" /** @class TranscodeFfmpeg diff --git a/gtk2_ardour/video_monitor.h b/gtk2_ardour/video_monitor.h index 80273cf5e3..5f3a4b3850 100644 --- a/gtk2_ardour/video_monitor.h +++ b/gtk2_ardour/video_monitor.h @@ -26,7 +26,7 @@ #include "ardour/types.h" #include "ardour/session.h" #include "ardour/session_handle.h" -#include "pbd/system_exec.h" +#include "ardour/system_exec.h" namespace ARDOUR { class Session;