diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-22 09:34:39 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-22 09:34:39 -0400 |
| commit | ff46a3c3a216afc97fee0c796ac2eaa92d58becb (patch) | |
| tree | ae3c420e51a8f0ed54955014e593caffd33df9d0 /gtk2_ardour/video_image_frame.cc | |
| parent | 88caf84b814593e7e34c7b81c77fb5c81b925aaa (diff) | |
| parent | 99f9b3456ab72d8172ce8296ed57417558ab73c7 (diff) | |
Merge branch 'canvasredesign' into cairocanvas
Diffstat (limited to 'gtk2_ardour/video_image_frame.cc')
| -rw-r--r-- | gtk2_ardour/video_image_frame.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/video_image_frame.cc b/gtk2_ardour/video_image_frame.cc index 1ae69f02e1..861c763665 100644 --- a/gtk2_ardour/video_image_frame.cc +++ b/gtk2_ardour/video_image_frame.cc @@ -24,7 +24,7 @@ #include "video_image_frame.h" #include "public_editor.h" #include "utils.h" -#include "canvas/group.h" +#include "canvas/layout.h" #include "utils_videotl.h" #include <gtkmm2ext/utils.h> @@ -43,7 +43,7 @@ static void freedata_cb (uint8_t *d, void* /*arg*/) { free (d); } -VideoImageFrame::VideoImageFrame (PublicEditor& ed, ArdourCanvas::Group& parent, int w, int h, std::string vsurl, std::string vfn) +VideoImageFrame::VideoImageFrame (PublicEditor& ed, ArdourCanvas::Layout& parent, int w, int h, std::string vsurl, std::string vfn) : editor (ed) , _parent(&parent) , clip_width(w) |