diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
| commit | ee1b49f87e4b8e6406c059f29371892872d3fb85 (patch) | |
| tree | 107f163d9f707c97a0b8179a5f2afd9995d616ec /gtk2_ardour/video_image_frame.cc | |
| parent | 8cd71108c1d153f84f25c3b9e5153a110826c130 (diff) | |
| parent | 1421a34e52862b614f280c751a12893e4abecf88 (diff) | |
fix merge conflicts from master
Diffstat (limited to 'gtk2_ardour/video_image_frame.cc')
| -rw-r--r-- | gtk2_ardour/video_image_frame.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk2_ardour/video_image_frame.cc b/gtk2_ardour/video_image_frame.cc index 310f3a68d3..864aca4bb9 100644 --- a/gtk2_ardour/video_image_frame.cc +++ b/gtk2_ardour/video_image_frame.cc @@ -36,6 +36,7 @@ using namespace std; using namespace ARDOUR; +using namespace VideoUtils; VideoImageFrame::VideoImageFrame (PublicEditor& ed, ArdourCanvas::Group& parent, int w, int h, std::string vsurl, std::string vfn) : editor (ed) @@ -196,8 +197,8 @@ http_get_thread (void *arg) { int timeout = 1000; // * 5ms -> 5sec char *res = NULL; do { - res=curl_http_get(url, &status); - if (status == 503) Glib::usleep(5000); // try-again + res=a3_curl_http_get(url, &status); + if (status == 503) usleep(5000); // try-again } while (status == 503 && --timeout > 0); if (status != 200 || !res) { |