diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-22 11:41:05 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-22 11:41:05 -0400 |
| commit | 6a5d805b383cd71bb1d0984964439c5ec08e9270 (patch) | |
| tree | d551b417d1dbc026376207a94b4933a0b824797b /gtk2_ardour/video_image_frame.h | |
| parent | f0933bf00551ce998ca441aa5611d27702f6e590 (diff) | |
more canvas refactoring.
Remove Canvas::Layout, use Canvas::Container for the same purpose, move child-rendering into Item::render_children() so that it
could theoretically be used by any derived type.
Diffstat (limited to 'gtk2_ardour/video_image_frame.h')
| -rw-r--r-- | gtk2_ardour/video_image_frame.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/video_image_frame.h b/gtk2_ardour/video_image_frame.h index cbe3a8da91..8f9e004c67 100644 --- a/gtk2_ardour/video_image_frame.h +++ b/gtk2_ardour/video_image_frame.h @@ -32,7 +32,7 @@ #include "ardour/ardour.h" #include "pbd/signals.h" -#include "canvas/layout.h" +#include "canvas/container.h" #include "canvas/pixbuf.h" #include "canvas/image.h" @@ -49,7 +49,7 @@ class PublicEditor; class VideoImageFrame : public sigc::trackable { public: - VideoImageFrame (PublicEditor&, ArdourCanvas::Layout&, 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 +69,7 @@ class VideoImageFrame : public sigc::trackable protected: PublicEditor& editor; - ArdourCanvas::Layout *_parent; + ArdourCanvas::Container *_parent; ArdourCanvas::Image *image; boost::shared_ptr<ArdourCanvas::Image::Data> img; |