diff options
author | Robin Gareus <robin@gareus.org> | 2013-06-14 21:09:24 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2013-06-14 21:09:24 +0200 |
commit | 11619a37bff79c050e39e434bc9899b516cbe4a1 (patch) | |
tree | b95d913f0af41800a50298185c9ab4c42a12110d /gtk2_ardour/video_image_frame.cc | |
parent | 46b6987311a305c1de718f8e73f365b796572c45 (diff) | |
parent | 77ac803ba0b250cab5aa1778f8613d00020df82f (diff) |
Merge branch 'master' into cairocanvas
Conflicts:
gtk2_ardour/editor_canvas.cc
gtk2_ardour/imageframe_time_axis.cc
gtk2_ardour/imageframe_time_axis.h
gtk2_ardour/imageframe_time_axis_group.cc
gtk2_ardour/imageframe_time_axis_group.h
gtk2_ardour/imageframe_time_axis_view.cc
gtk2_ardour/imageframe_time_axis_view.h
gtk2_ardour/imageframe_view.cc
gtk2_ardour/imageframe_view.h
gtk2_ardour/marker_time_axis.cc
gtk2_ardour/marker_time_axis.h
gtk2_ardour/marker_time_axis_view.cc
gtk2_ardour/marker_time_axis_view.h
gtk2_ardour/marker_view.cc
gtk2_ardour/marker_view.h
gtk2_ardour/video_image_frame.cc
gtk2_ardour/visual_time_axis.cc
gtk2_ardour/visual_time_axis.h
libs/canvas/canvas/circle.h
Diffstat (limited to 'gtk2_ardour/video_image_frame.cc')
-rw-r--r-- | gtk2_ardour/video_image_frame.cc | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/gtk2_ardour/video_image_frame.cc b/gtk2_ardour/video_image_frame.cc index e9520634bb..63fcba49aa 100644 --- a/gtk2_ardour/video_image_frame.cc +++ b/gtk2_ardour/video_image_frame.cc @@ -292,69 +292,3 @@ VideoImageFrame::http_get_again(framepos_t /*fn*/) { http_get_thread(this); } - -extern "C" { -#include <curl/curl.h> - - struct MemoryStruct { - char *data; - size_t size; - }; - - static size_t - WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data) { - size_t realsize = size * nmemb; - struct MemoryStruct *mem = (struct MemoryStruct *)data; - - mem->data = (char *)realloc(mem->data, mem->size + realsize + 1); - if (mem->data) { - memcpy(&(mem->data[mem->size]), ptr, realsize); - mem->size += realsize; - mem->data[mem->size] = 0; - } - return realsize; - } - - char *curl_http_get (const char *u, int *status) { - CURL *curl; - CURLcode res; - struct MemoryStruct chunk; - long int httpstatus; - if (status) *status = 0; - if (strncmp("http://", u, 7)) return NULL; - - chunk.data=NULL; - chunk.size=0; - - curl = curl_easy_init(); - if(!curl) return NULL; - curl_easy_setopt(curl, CURLOPT_URL, u); - - curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback); - curl_easy_setopt(curl, CURLOPT_USERAGENT, ARDOUR_USER_AGENT); - curl_easy_setopt(curl, CURLOPT_TIMEOUT, ARDOUR_CURL_TIMEOUT); - curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); -#ifdef CURLERRORDEBUG - char curlerror[CURL_ERROR_SIZE] = ""; - curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curlerror); -#endif - - res = curl_easy_perform(curl); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &httpstatus); - curl_easy_cleanup(curl); - if (status) *status = httpstatus; - if (res) { -#ifdef CURLERRORDEBUG - printf("curl_http_get() failed: %s\n", curlerror); -#endif - return NULL; - } - if (httpstatus != 200) { - free (chunk.data); - chunk.data = NULL; - } - return (chunk.data); - } - -} /* end extern "C" */ |