fix merge conflicts from master

[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 38a7a5994f5c74007ffafcfcc77d5b4ea83b79d5..864aca4bb98175386997f3b2b54e391b5c4fcec7 100644 (file)
--- a/gtk2_ardour/video_image_frame.cc
+++ b/gtk2_ardour/video_image_frame.cc
@@ -247,7 +247,7 @@ VideoImageFrame::http_download_done (char *data){
 
        exposeimg();
        /* don't request frames too quickly, wait after user has zoomed */
-       usleep(40000);
+       Glib::usleep(40000);
 
        if (queued_request) {
                http_get_again(want_video_frame_number);