Fix --template commandline option

[ardour.git] / gtk2_ardour / video_timeline.cc

diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 0c5b0801248512a3714c089fd1f9e37b984fcbce..0626a4b9a1c65ff0af2f73dc8206f5ebbc405329 100644 (file)
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -23,6 +23,7 @@
 
 #include "pbd/file_utils.h"
 #include "pbd/types_convert.h"
+#include "ardour/filesystem_paths.h"
 #include "ardour/session_directory.h"
 
 #include "ardour_ui.h"
@@ -32,7 +33,6 @@
 #include "utils_videotl.h"
 #include "rgb_macros.h"
 #include "video_timeline.h"
-#include "video_tool_paths.h"
 
 #include <gtkmm2ext/utils.h>
 #include <pthread.h>
@@ -544,7 +544,7 @@ VideoTimeLine::check_server ()
                        , video_server_url.c_str()
                        , (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/"
                        );
-       char* res = ArdourCurl::http_get (url, NULL);
+       char* res = ArdourCurl::http_get (url, NULL, false);
        if (res) {
                if (strstr(res, "status: ok, online.")) { ok = true; }
                free(res);
@@ -566,7 +566,7 @@ VideoTimeLine::check_server_docroot ()
                        , video_server_url.c_str()
                        , (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/"
                        );
-       char* res = ArdourCurl::http_get (url, NULL);
+       char* res = ArdourCurl::http_get (url, NULL, false);
        if (!res) {
                return false;
        }
@@ -662,7 +662,7 @@ VideoTimeLine::flush_cache () {
                        , video_server_url.c_str()
                        , (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/"
                        );
-       char* res = ArdourCurl::http_get (url, NULL);
+       char* res = ArdourCurl::http_get (url, NULL, false);
        if (res) {
                free (res);
        }
@@ -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;
        }