#include "canvas/xfade_curve.h"
#include "canvas/interpolated_curve.h"
-#include "canvas/utils.h"
using namespace ArdourCanvas;
using std::min;
#else
static const bool show_bg_fades = true;
#endif
-
+
XFadeCurve::XFadeCurve (Canvas* c)
: Item (c)
, points_per_segment (32)
_bounding_box = bbox.expand (1.0);
} else {
- _bounding_box = boost::optional<Rect> ();
+ _bounding_box = Rect ();
}
_bounding_box_dirty = false;
Points::size_type left = 0;
Points::size_type right = c.n_samples - 1;
+ assert (left < right);
// we should really really do a binary search rather than iterate
for (Points::size_type idx = 0; idx < c.n_samples - 1; ++idx) {
left = idx;
window_space = item_to_window (Duple (c.samples[idx].x, 0.0), false);
if (window_space.x >= area.x0) break;
}
- for (Points::size_type idx = c.n_samples; idx >= left;) {
- --idx;
+ for (Points::size_type idx = c.n_samples - 1; right > left;) {
+ if (--idx <= left) break;
window_space = item_to_window (Duple (c.samples[idx].x, 0.0), false);
if (window_space.x <= area.x1) break;
right = idx;
if (_in.points.size() < 2) { return; }
if (_out.points.size() < 2) { return; }
- Rect self = item_to_window (_bounding_box.get());
- boost::optional<Rect> d = self.intersection (area);
+ Rect self = item_to_window (_bounding_box);
+ Rect d = self.intersection (area);
assert (d);
- Rect draw = d.get ();
+ Rect draw = d;
context->save ();
context->rectangle (draw.x0, draw.y0, draw.width(), draw.height());
Cairo::Path *path_in = get_path(draw, context, _in);
Cairo::Path *path_out = get_path(draw, context, _out);
- Color outline_shaded = _outline_color;
+ Gtkmm2ext::Color outline_shaded = _outline_color;
outline_shaded = 0.5 * (outline_shaded & 0xff) + (outline_shaded & ~0xff);
- Color fill_shaded = _fill_color;
+ Gtkmm2ext::Color fill_shaded = _fill_color;
fill_shaded = 0.5 * (fill_shaded & 0xff) + (fill_shaded & ~0xff);
#define IS_START (_xfadeposition == Start)
context->begin_new_path ();
context->append_path (IS_START ? *path_in : *path_out);
close_path(draw, context, IS_START ?_in : _out, false);
- set_source_rgba (context, _fill_color);
+ Gtkmm2ext::set_source_rgba (context, _fill_color);
context->fill ();
if (show_background_fade) {
context->begin_new_path ();
context->append_path (IS_START ? *path_out: *path_in);
close_path(draw, context, IS_START ? _out : _in, true);
- set_source_rgba (context, fill_shaded);
+ Gtkmm2ext::set_source_rgba (context, fill_shaded);
context->set_fill_rule (Cairo::FILL_RULE_WINDING);
context->fill ();
context->restore ();
/* draw lines over fills */
/* fade in line */
if (IS_START || show_background_fade) {
- set_source_rgba (context, IS_START ? _outline_color : outline_shaded);
+ Gtkmm2ext::set_source_rgba (context, IS_START ? _outline_color : outline_shaded);
context->set_line_width (IS_START ? 1.0 : .5);
-
+
context->begin_new_path ();
context->append_path (*path_in);
context->stroke();
/* fade out line */
if (!IS_START || show_background_fade) {
- set_source_rgba (context, IS_START ? outline_shaded :_outline_color);
+ Gtkmm2ext::set_source_rgba (context, IS_START ? outline_shaded :_outline_color);
context->set_line_width (IS_START ? .5 : 1.0);
context->begin_new_path ();