using namespace std;
using namespace ARDOUR;
+using namespace VideoUtils;
-static void freedata_cb (uint8_t *d, void *arg) {
+static void freedata_cb (uint8_t *d, void* /*arg*/) {
/* later this can be used with libharvid
* the buffer/videocacheline instead of freeing it
*/
int timeout = 1000; // * 5ms -> 5sec
char *res = NULL;
do {
- res=curl_http_get(url, &status);
- if (status == 503) usleep(5000); // try-again
+ res=a3_curl_http_get(url, &status);
+ if (status == 503) Glib::usleep(5000); // try-again
} while (status == 503 && --timeout > 0);
if (status != 200 || !res) {
void
VideoImageFrame::http_download_done (char *data){
if (queued_request) {
- http_maybe_get_again();
+ http_get_again(want_video_frame_number);
return;
}
}
exposeimg();
- /* don't request frames rapidly, wait after user has zoomed */
- usleep(20000);
+ /* don't request frames too quickly, wait after user has zoomed */
+ Glib::usleep(40000);
if (queued_request) {
- http_maybe_get_again();
+ http_get_again(want_video_frame_number);
}
pthread_mutex_unlock(&request_lock);
}
}
void
-VideoImageFrame::http_maybe_get_again() {
+VideoImageFrame::http_get_again(framepos_t /*fn*/) {
pthread_mutex_lock(&queue_lock);
queued_request=false;
req_video_frame_number=want_video_frame_number;
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" */