using namespace ArdourCanvas;
-Image::Image (Group* group, Cairo::Format fmt, int width, int height)
- : Item (group)
+Image::Image (Canvas* canvas, Cairo::Format fmt, int width, int height)
+ : Item (canvas)
, _format (fmt)
, _width (width)
, _height (height)
DataReady.connect (data_connections, MISSING_INVALIDATOR, boost::bind (&Image::accept_data, this), gui_context());
}
-void
+Image::Image (Item* parent, Cairo::Format fmt, int width, int height)
+ : Item (parent)
+ , _format (fmt)
+ , _width (width)
+ , _height (height)
+ , _need_render (false)
+{
+ DataReady.connect (data_connections, MISSING_INVALIDATOR, boost::bind (&Image::accept_data, this), gui_context());
+}
+
+void
Image::render (Rect const& area, Cairo::RefPtr<Cairo::Context> context) const
{
if (_need_render && _pending) {
_pending->stride);
_current = _pending;
}
-
+
Rect self = item_to_window (Rect (0, 0, _width, _height));
- boost::optional<Rect> draw = self.intersection (area);
+ Rect draw = self.intersection (area);
if (_surface && draw) {
context->set_source (_surface, self.x0, self.y0);
- context->rectangle (draw->x0, draw->y0, draw->width(), draw->height());
+ context->rectangle (draw.x0, draw.y0, draw.width(), draw.height());
context->fill ();
}
}
void
Image::compute_bounding_box () const
{
- _bounding_box = boost::optional<Rect> (Rect (0, 0, _width, _height));
+ _bounding_box = Rect (0, 0, _width, _height);
_bounding_box_dirty = false;
}
}
void
-Image::accept_data ()
+Image::accept_data ()
{
/* must be executed in gui thread */
begin_change ();
_need_render = true;
end_change (); // notify canvas that we need redrawing
-}
+}