diff options
author | Robin Gareus <robin@gareus.org> | 2013-08-03 16:54:57 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2013-08-03 16:54:57 +0200 |
commit | 43ae996b3a18ecad15f6fe872c4194d23b2200cf (patch) | |
tree | 575161e411791352962444a8cb6cafd0aaee4af0 /gtk2_ardour/video_timeline.cc | |
parent | ef3551300ad02de99160fa659edf6cd11040b5f3 (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 9a48fcc9e3..75f6150691 100644 --- a/gtk2_ardour/video_timeline.cc +++ b/gtk2_ardour/video_timeline.cc @@ -45,6 +45,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) @@ -552,7 +553,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); @@ -574,7 +575,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; } @@ -670,7 +671,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); } |