mode dummy speeds

[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 e5cd197782e38bb5c1d92514de57a53923e96dd7..43f12aa9f35aa0754bd698554560181e5e24d12b 100644 (file)
--- a/gtk2_ardour/video_image_frame.cc
+++ b/gtk2_ardour/video_image_frame.cc
@@ -23,8 +23,7 @@
 #include "ardour_ui.h"
 #include "video_image_frame.h"
 #include "public_editor.h"
-#include "utils.h"
-#include "canvas/group.h"
+#include "canvas/container.h"
 #include "utils_videotl.h"
 
 #include <gtkmm2ext/utils.h>
@@ -43,7 +42,7 @@ static void freedata_cb (uint8_t *d, void* /*arg*/) {
        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)
@@ -201,7 +200,7 @@ http_get_thread (void *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()
@@ -211,7 +210,7 @@ http_get_thread (void *arg) {
        char *res = NULL;
        do {
                res=a3_curl_http_get(url, &status);
-               if (status == 503) usleep(5000); // try-again
+               if (status == 503) Glib::usleep(5000); // try-again
        } while (status == 503 && --timeout > 0);
 
        if (status != 200 || !res) {
@@ -250,8 +249,8 @@ 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_get_again(want_video_frame_number);