X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvideo_image_frame.h;h=aeb117da9f8d0d74127f4ab07de0ac091d746732;hb=9e543beb569f40edb3312c3c213d21b763b30d5a;hp=403eff9cf9cb9fc54d2406d0492ad8b2f54d12f6;hpb=6830d83236ae047eb077802cdb54eff5492928d3;p=ardour.git

diff --git a/gtk2_ardour/video_image_frame.h b/gtk2_ardour/video_image_frame.h
index 403eff9cf9..aeb117da9f 100644
--- a/gtk2_ardour/video_image_frame.h
+++ b/gtk2_ardour/video_image_frame.h
@@ -17,14 +17,9 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #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>
 
@@ -34,8 +29,9 @@
 #include "ardour/ardour.h"
 #include "pbd/signals.h"
 
-#include "canvas/group.h"
+#include "canvas/container.h"
 #include "canvas/pixbuf.h"
+#include "canvas/image.h"
 
 namespace ARDOUR {
 	class TempoSection;
@@ -50,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);
@@ -70,9 +66,9 @@ class VideoImageFrame : public sigc::trackable
 	protected:
 
 	PublicEditor& editor;
-	ArdourCanvas::Group *_parent;
-	ArdourCanvas::Group *group;
-	ArdourCanvas::Pixbuf *img_pixbuf;
+	ArdourCanvas::Container *_parent;
+	ArdourCanvas::Image *image;
+	boost::shared_ptr<ArdourCanvas::Image::Data> img;
 
 	int clip_width;
 	int clip_height;
@@ -82,13 +78,15 @@ class VideoImageFrame : public sigc::trackable
 	std::string video_filename;
 
 	double        unit_position;
-	framepos_t   frame_position;
+	framepos_t   sample_position;
 	framepos_t   video_frame_number;
 
 	void reposition ();
 	void exposeimg ();
 
+	void fill_frame (const uint8_t r, const uint8_t g, const uint8_t b);
 	void draw_line ();
+	void draw_x ();
 	void cut_rightend ();
 
 
@@ -107,10 +105,4 @@ class VideoImageFrame : public sigc::trackable
 
 };
 
-extern "C" {
-	char *curl_http_get (const char *u, int *status);
-}
-
 #endif /* __ardour_video_image_frame_h__ */
-
-#endif /* WITH_VIDEOTIMELINE */