Oops. Fix XML stuff in GUI as well.

[ardour.git] / gtk2_ardour / crossfade_view.cc

diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc
index 1b5f4d886a516d80c0381be0b6c7698639f0b825..c4a74b8a189cca84a958d1befc80799051324830 100644 (file)
--- a/gtk2_ardour/crossfade_view.cc
+++ b/gtk2_ardour/crossfade_view.cc
@@ -69,7 +69,7 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent,
        fade_out->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeLine.get();
        fade_out->property_width_pixels() = 1;
        
-       set_y_position_and_height (0, get_time_axis_view().current_height());
+       set_height (get_time_axis_view().current_height());
 
        /* no frame around the xfade or overlap rects */
 
@@ -80,7 +80,7 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent,
        vestigial_frame->hide();
        show_vestigial = false;
        
-       group->signal_event().connect (bind (mem_fun (tv.editor, &PublicEditor::canvas_crossfade_view_event), group, this));
+       group->signal_event().connect (bind (mem_fun (tv.editor(), &PublicEditor::canvas_crossfade_view_event), group, this));
        
        crossfade_changed (Change (~0));
 
@@ -107,12 +107,12 @@ CrossfadeView::reset_width_dependent_items (double pixel_width)
 }
 
 void
-CrossfadeView::set_y_position_and_height (double y, double h)
+CrossfadeView::set_height (double height)
 {
-       if (h <= TimeAxisView::hSmaller) {
-               TimeAxisViewItem::set_y_position_and_height (y, h - 3);
+       if (height <= TimeAxisView::hSmaller) {
+               TimeAxisViewItem::set_height (height - 3);
        } else {
-               TimeAxisViewItem::set_y_position_and_height (y, h - NAME_HIGHLIGHT_SIZE - 3 );
+               TimeAxisViewItem::set_height (height - NAME_HIGHLIGHT_SIZE - 3 );
        }
 
        redraw_curves ();
@@ -174,8 +174,8 @@ CrossfadeView::redraw_curves ()
                return;
        }
 
-       npoints = get_time_axis_view().editor.frame_to_pixel (crossfade->length());
-       npoints = std::min (gdk_screen_width(), npoints);
+       npoints = get_time_axis_view().editor().frame_to_pixel (crossfade->length());
+       // npoints = std::min (gdk_screen_width(), npoints);
 
        if (!_visible || !crossfade->active() || npoints < 3) {
                fade_in->hide();
@@ -190,10 +190,11 @@ CrossfadeView::redraw_curves ()
        vec = new float[npoints];
 
        crossfade->fade_in().curve().get_vector (0, crossfade->length(), vec, npoints);
+
        for (int i = 0, pci = 0; i < npoints; ++i) {
                Art::Point &p = (*points)[pci++];
                p.set_x(i);
-               p.set_y(_y_position + 2.0 + h - (h * vec[i]));
+               p.set_y(2.0 + h - (h * vec[i]));
        }
        fade_in->property_points() = *points;
 
@@ -201,7 +202,7 @@ CrossfadeView::redraw_curves ()
        for (int i = 0, pci = 0; i < npoints; ++i) {
                Art::Point &p = (*points)[pci++];
                p.set_x(i);
-               p.set_y(_y_position + 2.0 + h - (h * vec[i]));
+               p.set_y(2.0 + h - (h * vec[i]));
        }
        fade_out->property_points() = *points;