X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fvideo_image_frame.h;h=aeb117da9f8d0d74127f4ab07de0ac091d746732;hb=99054ea415c8a28227024bc27152fdf30379bdf9;hp=1fe543dce56c41190ba9d1a0971fc98c89bca265;hpb=930fce869604dc2ebd03a1510924c7ab3cda8792;p=ardour.git

diff --git a/gtk2_ardour/video_image_frame.h b/gtk2_ardour/video_image_frame.h
index 1fe543dce5..aeb117da9f 100644
--- a/gtk2_ardour/video_image_frame.h
+++ b/gtk2_ardour/video_image_frame.h
@@ -20,9 +20,6 @@
 #ifndef __ardour_video_image_frame_h__
 #define __ardour_video_image_frame_h__
 
-#define ARDOUR_USER_AGENT (PROGRAM_NAME VERSIONSTRING)
-#define ARDOUR_CURL_TIMEOUT (60)
-
 #include <string>
 #include <glib.h>
 
@@ -32,7 +29,7 @@
 #include "ardour/ardour.h"
 #include "pbd/signals.h"
 
-#include "canvas/group.h"
+#include "canvas/container.h"
 #include "canvas/pixbuf.h"
 #include "canvas/image.h"
 
@@ -49,7 +46,7 @@ class PublicEditor;
 class VideoImageFrame : public sigc::trackable
 {
 	public:
-	VideoImageFrame (PublicEditor&, ArdourCanvas::Group&, int, int, std::string, std::string);
+	VideoImageFrame (PublicEditor&, ArdourCanvas::Container&, int, int, std::string, std::string);
 	virtual ~VideoImageFrame ();
 
 	void set_position (framepos_t);
@@ -69,7 +66,7 @@ class VideoImageFrame : public sigc::trackable
 	protected:
 
 	PublicEditor& editor;
-	ArdourCanvas::Group *_parent;
+	ArdourCanvas::Container *_parent;
 	ArdourCanvas::Image *image;
 	boost::shared_ptr<ArdourCanvas::Image::Data> img;
 
@@ -94,7 +91,7 @@ class VideoImageFrame : public sigc::trackable
 
 
 	void http_get(framepos_t fn);
-	void http_maybe_get_again();
+	void http_get_again(framepos_t fn);
 
 	framepos_t req_video_frame_number;
 	framepos_t want_video_frame_number;
@@ -108,8 +105,4 @@ class VideoImageFrame : public sigc::trackable
 
 };
 
-extern "C" {
-	char *curl_http_get (const char *u, int *status);
-}
-
 #endif /* __ardour_video_image_frame_h__ */