use new Canvas::Note object for (sustained) note display

[ardour.git] / libs / canvas / curve.cc

diff --git a/libs/canvas/curve.cc b/libs/canvas/curve.cc
index 78d47f07e94e3f2dd3dbaa37a6511e8a6bc02dde..dac9983e07701de4050ced07834432c80c0ec5c7 100644 (file)
--- a/libs/canvas/curve.cc
+++ b/libs/canvas/curve.cc
@@ -90,10 +90,10 @@ Curve::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
                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;
 
        /* Our approach is to always draw n_segments across our total size.
         *
@@ -101,7 +101,7 @@ Curve::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
         * section of the curve. For now we rely on cairo clipping to help
         * with this.
         */
-       
+
 
        setup_outline_context (context);
 
@@ -165,7 +165,7 @@ Curve::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
                draw = draw.expand (4.0);
 
                /* now clip it to the actual points in the curve */
-               
+
                if (draw.x0 < w1.x) {
                        draw.x0 = w1.x;
                }