Use a C++ bool constant

[ardour.git] / gtk2_ardour / video_image_frame.h

diff --git a/gtk2_ardour/video_image_frame.h b/gtk2_ardour/video_image_frame.h
index 16ea193f555c26823bcc080f80b1d0dbf6e396d8..aeb117da9f8d0d74127f4ab07de0ac091d746732 100644 (file)
--- 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 <string>
 #include <glib.h>
 
@@ -32,8 +29,9 @@
 #include "ardour/ardour.h"
 #include "pbd/signals.h"
 
-#include "canvas/group.h"
+#include "canvas/container.h"
 #include "canvas/pixbuf.h"
+#include "canvas/image.h"
 
 namespace ARDOUR {
        class TempoSection;
@@ -48,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);
@@ -68,9 +66,9 @@ class VideoImageFrame : public sigc::trackable
        protected:
 
        PublicEditor& editor;
-       ArdourCanvas::Group *_parent;
-       ArdourCanvas::Group *group;
-       ArdourCanvas::Pixbuf *img_pixbuf;
+       ArdourCanvas::Container *_parent;
+       ArdourCanvas::Image *image;
+       boost::shared_ptr<ArdourCanvas::Image::Data> img;
 
        int clip_width;
        int clip_height;
@@ -80,13 +78,15 @@ class VideoImageFrame : public sigc::trackable
        std::string video_filename;
 
        double        unit_position;
-       framepos_t   frame_position;
+       framepos_t   sample_position;
        framepos_t   video_frame_number;
 
        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 ();
 
 
@@ -105,8 +105,4 @@ class VideoImageFrame : public sigc::trackable
 
 };
 
-extern "C" {
-       char *curl_http_get (const char *u, int *status);
-}
-
 #endif /* __ardour_video_image_frame_h__ */