X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvideo_timeline.h;h=5a1bceb25897b0c2b4595dd1ea2ef9a60e06e54d;hb=822810b88fd13d1764b5f686baa8edb3e27e95fc;hp=dd61d2ef73c6646c4cfa7471c87f856d683ec532;hpb=e466ce40ad1ba591543020cb7c0aa15dbebef81e;p=ardour.git diff --git a/gtk2_ardour/video_timeline.h b/gtk2_ardour/video_timeline.h index dd61d2ef73..5a1bceb258 100644 --- a/gtk2_ardour/video_timeline.h +++ b/gtk2_ardour/video_timeline.h @@ -29,7 +29,7 @@ #include "video_image_frame.h" #include "video_monitor.h" #include "pbd/signals.h" -#include "canvas/group.h" +#include "canvas/container.h" namespace ARDOUR { class Session; @@ -55,7 +55,7 @@ class PublicEditor; class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, public PBD::ScopedConnectionList, public PBD::StatefulDestructible { public: - VideoTimeLine (PublicEditor*, ArdourCanvas::Group*, int); + VideoTimeLine (PublicEditor*, ArdourCanvas::Container*, int); virtual ~VideoTimeLine (); void set_session (ARDOUR::Session *s); @@ -102,7 +102,7 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p protected: PublicEditor *editor; - ArdourCanvas::Group *videotl_group; + ArdourCanvas::Container *videotl_group; int bar_height; std::string _xjadeo_bin; @@ -123,6 +123,9 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p std::string video_server_url; std::string server_docroot; + void xjadeo_readversion (std::string d, size_t s); + std::string xjadeo_version; + typedef std::list VideoFrames; VideoFrames video_frames; VideoImageFrame *get_video_frame (framepos_t vfn, int cut=0, int rightend = -1);