Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows

[ardour.git] / gtk2_ardour / video_image_frame.h

diff --git a/gtk2_ardour/video_image_frame.h b/gtk2_ardour/video_image_frame.h
index 403eff9cf9cb9fc54d2406d0492ad8b2f54d12f6..b611ff0d9e6886364d4025831f9e00a65bd766fb 100644 (file)
--- a/gtk2_ardour/video_image_frame.h
+++ b/gtk2_ardour/video_image_frame.h
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #ifndef __ardour_video_image_frame_h__
 #define __ardour_video_image_frame_h__
 
@@ -36,6 +34,7 @@
 
 #include "canvas/group.h"
 #include "canvas/pixbuf.h"
+#include "canvas/image.h"
 
 namespace ARDOUR {
        class TempoSection;
@@ -71,8 +70,8 @@ class VideoImageFrame : public sigc::trackable
 
        PublicEditor& editor;
        ArdourCanvas::Group *_parent;
-       ArdourCanvas::Group *group;
-       ArdourCanvas::Pixbuf *img_pixbuf;
+       ArdourCanvas::Image *image;
+       boost::shared_ptr<ArdourCanvas::Image::Data> img;
 
        int clip_width;
        int clip_height;
@@ -82,13 +81,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 +108,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 */