X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvideo_image_frame.h;h=aeb117da9f8d0d74127f4ab07de0ac091d746732;hb=625240fe303fcd447bf7205396cdde57918b4d0c;hp=b611ff0d9e6886364d4025831f9e00a65bd766fb;hpb=fd23ebd0886cd61f8ee68d52d6576d00a16c9032;p=ardour.git diff --git a/gtk2_ardour/video_image_frame.h b/gtk2_ardour/video_image_frame.h index b611ff0d9e..aeb117da9f 100644 --- a/gtk2_ardour/video_image_frame.h +++ b/gtk2_ardour/video_image_frame.h @@ -20,9 +20,6 @@ #ifndef __ardour_video_image_frame_h__ #define __ardour_video_image_frame_h__ -#define ARDOUR_USER_AGENT (PROGRAM_NAME VERSIONSTRING) -#define ARDOUR_CURL_TIMEOUT (60) - #include #include @@ -32,7 +29,7 @@ #include "ardour/ardour.h" #include "pbd/signals.h" -#include "canvas/group.h" +#include "canvas/container.h" #include "canvas/pixbuf.h" #include "canvas/image.h" @@ -49,7 +46,7 @@ class PublicEditor; class VideoImageFrame : public sigc::trackable { public: - VideoImageFrame (PublicEditor&, ArdourCanvas::Group&, 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 +66,7 @@ class VideoImageFrame : public sigc::trackable protected: PublicEditor& editor; - ArdourCanvas::Group *_parent; + ArdourCanvas::Container *_parent; ArdourCanvas::Image *image; boost::shared_ptr img;