diff options
author | Robin Gareus <robin@gareus.org> | 2013-04-16 22:57:19 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2013-04-16 23:28:08 +0200 |
commit | b713af2083c9da1ab6f82b47abae1da94bc96654 (patch) | |
tree | 277e9fb983dac67ee030f646b4de2f92e7373a6f /gtk2_ardour/video_image_frame.h | |
parent | a74743f5516ec8fdfcaa6d6d6e0fe12999eba832 (diff) |
vtl: use ArdourImage
* update videotimeline -> new zoom, position API
* update image-frame use Cairo based ArdourImage instead of GdkPixbuf
Diffstat (limited to 'gtk2_ardour/video_image_frame.h')
-rw-r--r-- | gtk2_ardour/video_image_frame.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk2_ardour/video_image_frame.h b/gtk2_ardour/video_image_frame.h index 16ea193f55..d190d20da8 100644 --- a/gtk2_ardour/video_image_frame.h +++ b/gtk2_ardour/video_image_frame.h @@ -34,6 +34,7 @@ #include "canvas/group.h" #include "canvas/pixbuf.h" +#include "canvas/image.h" namespace ARDOUR { class TempoSection; @@ -70,7 +71,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; @@ -86,12 +88,14 @@ class VideoImageFrame : public sigc::trackable 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 (); void http_get(framepos_t fn); - void http_get_again(framepos_t fn); + void http_maybe_get_again(); framepos_t req_video_frame_number; framepos_t want_video_frame_number; |