Connect Script Manager "Edit" -> Lua Scripting Window

[ardour.git] / gtk2_ardour / video_image_frame.cc

diff --git a/gtk2_ardour/video_image_frame.cc b/gtk2_ardour/video_image_frame.cc
index c892bacfa684f72abb6e83919743156692eb96bb..093f2351077ed32ef52222f5b28cc36020370fe0 100644 (file)
--- a/gtk2_ardour/video_image_frame.cc
+++ b/gtk2_ardour/video_image_frame.cc
@@ -20,29 +20,30 @@
 #include <sigc++/bind.h>
 #include "ardour/tempo.h"
 
-#include "ardour_ui.h"
-#include "video_image_frame.h"
-#include "public_editor.h"
-#include "utils.h"
-#include "canvas/group.h"
-#include "utils_videotl.h"
-
 #include <gtkmm2ext/utils.h>
 #include <pthread.h>
 
-#include "i18n.h"
+#include "canvas/container.h"
+
+#include "ardour_http.h"
+#include "public_editor.h"
+#include "utils_videotl.h"
+#include "video_image_frame.h"
+
+#include "pbd/i18n.h"
 
 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
         */
        free (d);
 }
 
-VideoImageFrame::VideoImageFrame (PublicEditor& ed, ArdourCanvas::Group& parent, int w, int h, std::string vsurl, std::string vfn)
+VideoImageFrame::VideoImageFrame (PublicEditor& ed, ArdourCanvas::Container& parent, int w, int h, std::string vsurl, std::string vfn)
        : editor (ed)
        , _parent(&parent)
        , clip_width(w)
@@ -194,13 +195,13 @@ VideoImageFrame::cut_rightend ()
        }
 }
 
-void *
+static void *
 http_get_thread (void *arg) {
        VideoImageFrame *vif = static_cast<VideoImageFrame *>(arg);
        char url[2048];
        pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
        pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
-       snprintf(url, sizeof(url), "%s?frame=%li&w=%d&h=%di&file=%s&format=bgra",
+       snprintf(url, sizeof(url), "%s?frame=%li&w=%d&h=%d&file=%s&format=bgra",
          vif->get_video_server_url().c_str(),
          (long int) vif->get_req_frame(), vif->get_width(), vif->get_height(),
          vif->get_video_filename().c_str()
@@ -209,8 +210,8 @@ http_get_thread (void *arg) {
        int timeout = 1000; // * 5ms -> 5sec
        char *res = NULL;
        do {
-               res=curl_http_get(url, &status);
-               if (status == 503) usleep(5000); // try-again
+               res = ArdourCurl::http_get (url, &status);
+               if (status == 503) Glib::usleep(5000); // try-again
        } while (status == 503 && --timeout > 0);
 
        if (status != 200 || !res) {
@@ -226,7 +227,7 @@ http_get_thread (void *arg) {
 void
 VideoImageFrame::http_download_done (char *data){
        if (queued_request) {
-               http_maybe_get_again();
+               http_get_again(want_video_frame_number);
                return;
        }
 
@@ -249,11 +250,11 @@ VideoImageFrame::http_download_done (char *data){
        }
 
        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);
 }
@@ -283,7 +284,7 @@ VideoImageFrame::http_get(framepos_t fn) {
 }
 
 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;
@@ -292,69 +293,3 @@ VideoImageFrame::http_maybe_get_again() {
        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" */