NO-OP; clean up script spacing and remove goto

[ardour.git] / gtk2_ardour / video_timeline.cc

diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 0e109f32d4af186c971768076e46fd4de41299d6..95952c52a585328ae31a69f9cc443e76af73ad95 100644 (file)
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -26,6 +26,7 @@
 #include "ardour/session_directory.h"
 
 #include "ardour_ui.h"
+#include "ardour_http.h"
 #include "public_editor.h"
 #include "gui_thread.h"
 #include "utils_videotl.h"
@@ -58,8 +59,6 @@ VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Container *vbg, in
        video_offset_lock = false;
        video_aspect_ratio = 4.0/3.0;
        Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&VideoTimeLine::parameter_changed, this, _1), gui_context());
-       video_server_url = video_get_server_url(Config);
-       server_docroot   = video_get_docroot(Config);
        video_filename = "";
        local_file = true;
        video_file_fps = 25.0;
@@ -67,6 +66,9 @@ VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Container *vbg, in
        vmonitor=0;
        reopen_vmonitor=false;
        find_xjadeo();
+       find_harvid();
+       video_server_url = video_get_server_url(Config);
+       server_docroot   = video_get_docroot(Config);
 
        VtlUpdate.connect (*this, invalidator (*this), boost::bind (&PublicEditor::queue_visual_videotimeline_update, editor), gui_context());
        GuiUpdate.connect (*this, invalidator (*this), boost::bind (&VideoTimeLine::gui_update, this, _1), gui_context());
@@ -556,7 +558,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=a3_curl_http_get(url, NULL);
+       char* res = ArdourCurl::http_get (url, NULL);
        if (res) {
                if (strstr(res, "status: ok, online.")) { ok = true; }
                free(res);
@@ -578,7 +580,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=a3_curl_http_get(url, NULL);
+       char* res = ArdourCurl::http_get (url, NULL);
        if (!res) {
                return false;
        }
@@ -674,7 +676,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=a3_curl_http_get(url, NULL);
+       char* res = ArdourCurl::http_get (url, NULL);
        if (res) {
                free (res);
        }
@@ -779,6 +781,61 @@ VideoTimeLine::find_xjadeo () {
        }
 }
 
+void
+VideoTimeLine::harvid_readversion (std::string d, size_t /* s */) {
+       harvid_version += d;
+}
+
+void
+VideoTimeLine::find_harvid () {
+       /* This is mainly for the benefit of the windows version:
+        * harvid >= 0.8.2 allows an empty docroot and ardour can
+        * pass the drive-letter along.
+        *
+        * It is a chicken/egg w.r.t. the video-server dialog
+        * but needed for default preferences and initial settings.
+        */
+       std::string harvid_bin;
+       if (VideoUtils::harvid_version != 0x0) {
+               return;
+       }
+       if (!ArdourVideoToolPaths::harvid_exe(harvid_bin)) {
+               return;
+       }
+       if (harvid_bin.empty ()) {
+               return;
+       }
+       ARDOUR::SystemExec version_check(harvid_bin, X_("--version"));
+       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)) {
+               return;
+       }
+
+#ifdef PLATFORM_WINDOWS
+       version_check.wait (); // 40ms timeout
+#else
+       version_check.wait (WNOHANG);
+#endif
+
+       int timeout = 300;
+       while (harvid_version.empty() && --timeout) {
+               Glib::usleep(10000);
+       }
+
+       size_t vo = harvid_version.find("harvid v");
+       if (vo != string::npos) {
+               int v_major, v_minor, v_micro;
+               if(sscanf(harvid_version.substr(vo + 8, string::npos).c_str(),"%d.%d.%d",
+                                       &v_major, &v_minor, &v_micro) == 3)
+               {
+                       VideoUtils::harvid_version = (v_major << 16) | (v_minor << 8) | v_micro;
+                       info << "harvid version: "<< hex << VideoUtils::harvid_version << endmsg;
+               }
+       }
+}
+
 void
 VideoTimeLine::open_video_monitor() {
        if (!found_xjadeo()) return;