diff options
author | Robin Gareus <robin@gareus.org> | 2013-08-03 16:54:57 +0200 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-08 15:26:19 -0400 |
commit | b5845ea45859dd3a823f2aa59fac2aaefcb6e087 (patch) | |
tree | 906ed5da9166acfc7b78c065e555b070e6bd1a69 /gtk2_ardour/video_timeline.cc | |
parent | 520b09e82a1fe3affa49fab6f194b369cfdbc034 (diff) |
dedicated namespace for video-utils
conflicting symbol prophylaxis
Diffstat (limited to 'gtk2_ardour/video_timeline.cc')
-rw-r--r-- | gtk2_ardour/video_timeline.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc index cfe30b243c..a1a85a0243 100644 --- 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); } |