improve timing accuracy for meter-falloff calc.

[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 b08be915902f20f3e7dd19526e19d048f9147918..8dfbdeeff49edbea1c774102a98605e72d645d99 100644 (file)
--- a/gtk2_ardour/region_gain_line.cc
+++ b/gtk2_ardour/region_gain_line.cc
@@ -18,9 +18,13 @@
 */
 
 #include "evoral/Curve.hpp"
-#include "ardour/audioregion.h"
 #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"
@@ -28,33 +32,36 @@
 #include "time_axis_view.h"
 #include "editor.h"
 
-#include "ardour/session.h"
-
 #include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-AudioRegionGainLine::AudioRegionGainLine (const string & name, Session& s, AudioRegionView& r, ArdourCanvas::Group& parent, boost::shared_ptr<AutomationList> l)
+AudioRegionGainLine::AudioRegionGainLine (const string & name, AudioRegionView& r, ArdourCanvas::Group& parent, boost::shared_ptr<AutomationList> l)
        : AutomationLine (name, r.get_time_axis_view(), parent, l)
-       , session (s)
        , rv (r)
 {
        // 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;
        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));
+               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,35 +70,30 @@ AudioRegionGainLine::start_drag (ControlPoint* cp, nframes_t x, float fraction)
 void
 AudioRegionGainLine::remove_point (ControlPoint& cp)
 {
-       ModelRepresentation mr;
-
-       model_representation (cp, mr);
-
-       trackview.editor().current_session()->begin_reversible_command (_("remove control point"));
+       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().current_session()->add_command (new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
-       trackview.editor().current_session()->commit_reversible_command ();
-       trackview.editor().current_session()->set_dirty ();
+       trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
+       trackview.editor().session()->commit_reversible_command ();
+       trackview.editor().session()->set_dirty ();
 }
 
 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()));
+               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);
 }