Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / video_timeline.cc

diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index f5915613fcfe34a6fd5b58177c8ab4e1fcc7a7ec..a1a85a02439e785dcec93f71370b70904fa2cba2 100644 (file)
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -43,6 +43,7 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Timecode;
+using namespace VideoUtils;
 
 VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Group *vbg, int initial_height)
        : editor (ed)
@@ -550,7 +551,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=curl_http_get(url, NULL);
+       char *res=a3_curl_http_get(url, NULL);
        if (res) {
                if (strstr(res, "status: ok, online.")) { ok = true; }
                free(res);
@@ -572,7 +573,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=curl_http_get(url, NULL);
+       char *res=a3_curl_http_get(url, NULL);
        if (!res) {
                return false;
        }
@@ -668,7 +669,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=curl_http_get(url, NULL);
+       char *res=a3_curl_http_get(url, NULL);
        if (res) {
                free (res);
        }
@@ -816,8 +817,8 @@ VideoTimeLine::terminated_video_monitor () {
                vmonitor->save_session();
                delete vmonitor;
        }
-       GuiUpdate("set-xjadeo-active-off");
        vmonitor=0;
+       GuiUpdate("set-xjadeo-active-off");
        if (reopen_vmonitor) {
                reopen_vmonitor=false;
                open_video_monitor();