enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[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 a2c5cffa5af57866e6bf6b6c7ba2c529fad64ab2..fd09119bd294c5749fe89ad1991cfc9e3247370c 100644 (file)
--- a/gtk2_ardour/region_gain_line.cc
+++ b/gtk2_ardour/region_gain_line.cc
@@ -19,41 +19,49 @@
 
 #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"
 
 #include "time_axis_view.h"
 #include "editor.h"
+#include "gui_thread.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-AudioRegionGainLine::AudioRegionGainLine (const string & name, AudioRegionView& r, ArdourCanvas::Group& parent, boost::shared_ptr<AutomationList> l)
-       : AutomationLine (name, r.get_time_axis_view(), parent, l)
+AudioRegionGainLine::AudioRegionGainLine (const string & name, AudioRegionView& r, ArdourCanvas::Container& parent, boost::shared_ptr<AutomationList> l)
+       : AutomationLine (name, r.get_time_axis_view(), parent, l, l->parameter())
        , 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 (rv.region()->position());
+
+       r.region()->PropertyChanged.connect (_region_changed_connection, invalidator (*this), boost::bind (&AudioRegionGainLine::region_changed, this, _1), gui_context());
+
        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_single (ControlPoint* cp, nframes_t x, float fraction)
+AudioRegionGainLine::start_drag_single (ControlPoint* cp, double x, float 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);
@@ -64,35 +72,43 @@ AudioRegionGainLine::start_drag_single (ControlPoint* cp, nframes_t x, float fra
 void
 AudioRegionGainLine::remove_point (ControlPoint& cp)
 {
-       ModelRepresentation mr;
-
-       model_representation (cp, mr);
-
-       trackview.editor().session()->begin_reversible_command (_("remove control point"));
+       trackview.editor().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);
+       trackview.editor ().get_selection ().clear_points ();
+       alist->erase (cp.model());
 
        trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
-       trackview.editor().session()->commit_reversible_command ();
+       trackview.editor().commit_reversible_command ();
        trackview.editor().session()->set_dirty ();
 }
 
 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);
 }
 
+void
+AudioRegionGainLine::region_changed (const PropertyChange& what_changed)
+{
+       PropertyChange interesting_stuff;
+
+       interesting_stuff.add (ARDOUR::Properties::start);
+       interesting_stuff.add (ARDOUR::Properties::position);
+
+       if (what_changed.contains (interesting_stuff)) {
+               _time_converter->set_origin_b (rv.region()->position());
+       }
+}