Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / region_gain_line.cc

diff --git a/gtk2_ardour/region_gain_line.cc b/gtk2_ardour/region_gain_line.cc
index 39e1b7fda34bad6d1621ca8aaa59feeada1edca1..827ebde12d9babf60af2ef7092be4958796b9504 100644 (file)
--- a/gtk2_ardour/region_gain_line.cc
+++ b/gtk2_ardour/region_gain_line.cc
@@ -48,7 +48,7 @@ AudioRegionGainLine::AudioRegionGainLine (const string & name, AudioRegionView&
        _time_converter->set_origin_b (r.region()->position() - r.region()->start());
 
        group->raise_to_top ();
-       group->property_y() = 2;
+       group->set_y_position (2);
        set_uses_gain_mapping (true);
        terminal_points_can_slide = false;
 }
@@ -87,13 +87,13 @@ AudioRegionGainLine::remove_point (ControlPoint& cp)
 }
 
 void
-AudioRegionGainLine::end_drag ()
+AudioRegionGainLine::end_drag (bool with_push, uint32_t final_index)
 {
        if (!rv.audio_region()->envelope_active()) {
                rv.audio_region()->set_envelope_active(true);
                trackview.session()->add_command(new MementoCommand<AudioRegion>(*(rv.audio_region().get()), 0, &rv.audio_region()->get_state()));
        }
 
-       AutomationLine::end_drag ();
+       AutomationLine::end_drag (with_push, final_index);
 }