tweaks to improve enter/leave event handling - fixes at least some crashes caused...

[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 00352c96df7992b8418dca1e97ed137d4c8bfa2e..827ebde12d9babf60af2ef7092be4958796b9504 100644 (file)
--- a/gtk2_ardour/region_gain_line.cc
+++ b/gtk2_ardour/region_gain_line.cc
@@ -19,10 +19,12 @@
 
 #include "evoral/Curve.hpp"
 #include "pbd/memento_command.h"
+#include "pbd/stateful_diff_command.h"
 
 #include "ardour/audioregion.h"
 #include "ardour/session.h"
 
+#include "control_point.h"
 #include "region_gain_line.h"
 #include "audio_region_view.h"
 #include "utils.h"
@@ -43,16 +45,21 @@ AudioRegionGainLine::AudioRegionGainLine (const string & name, AudioRegionView&
        // If this isn't true something is horribly wrong, and we'll get catastrophic gain values
        assert(l->parameter().type() == EnvelopeAutomation);
 
+       _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;
 }
 
 void
-AudioRegionGainLine::start_drag (ControlPoint* cp, nframes_t x, float fraction)
+AudioRegionGainLine::start_drag_single (ControlPoint* cp, double x, float fraction)
 {
-       AutomationLine::start_drag (cp, x, fraction);
+       AutomationLine::start_drag_single (cp, x, fraction);
+
+        // XXX Stateful need to capture automation curve data
+
        if (!rv.audio_region()->envelope_active()) {
                trackview.session()->add_command(new MementoCommand<AudioRegion>(*(rv.audio_region().get()), &rv.audio_region()->get_state(), 0));
                rv.audio_region()->set_envelope_active(false);
@@ -63,21 +70,16 @@ AudioRegionGainLine::start_drag (ControlPoint* cp, nframes_t x, float fraction)
 void
 AudioRegionGainLine::remove_point (ControlPoint& cp)
 {
-       ModelRepresentation mr;
-
-       model_representation (cp, mr);
-
        trackview.editor().session()->begin_reversible_command (_("remove control point"));
        XMLNode &before = alist->get_state();
 
        if (!rv.audio_region()->envelope_active()) {
-               XMLNode &region_before = rv.audio_region()->get_state();
+                rv.audio_region()->clear_changes ();
                rv.audio_region()->set_envelope_active(true);
-               XMLNode &region_after = rv.audio_region()->get_state();
-               trackview.session()->add_command(new MementoCommand<AudioRegion>(*(rv.audio_region().get()), &region_before, &region_after));
+               trackview.session()->add_command(new StatefulDiffCommand (rv.audio_region()));
        }
 
-       alist->erase (mr.start, mr.end);
+       alist->erase (cp.model());
 
        trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
        trackview.editor().session()->commit_reversible_command ();
@@ -85,13 +87,13 @@ AudioRegionGainLine::remove_point (ControlPoint& cp)
 }
 
 void
-AudioRegionGainLine::end_drag (ControlPoint* cp)
+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(cp);
+       AutomationLine::end_drag (with_push, final_index);
 }