Another engine dialog edge-case fix to set the samplerate

[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 5ac985fa9a29b8ab680c7af44bd88d828933be39..134809c9e5c5417d395e729c0f9b9801977346a4 100644 (file)
--- a/gtk2_ardour/region_gain_line.cc
+++ b/gtk2_ardour/region_gain_line.cc
@@ -32,7 +32,7 @@
 #include "editor.h"
 #include "gui_thread.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -45,13 +45,12 @@ 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());
+       _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->set_y_position (2);
-       set_uses_gain_mapping (true);
        terminal_points_can_slide = false;
 }
 
@@ -60,7 +59,7 @@ AudioRegionGainLine::start_drag_single (ControlPoint* cp, double x, float fracti
 {
        AutomationLine::start_drag_single (cp, x, fraction);
 
-        // XXX Stateful need to capture automation curve data
+       // 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));
@@ -76,11 +75,12 @@ AudioRegionGainLine::remove_point (ControlPoint& cp)
        XMLNode &before = alist->get_state();
 
        if (!rv.audio_region()->envelope_active()) {
-                rv.audio_region()->clear_changes ();
+               rv.audio_region()->clear_changes ();
                rv.audio_region()->set_envelope_active(true);
                trackview.session()->add_command(new StatefulDiffCommand (rv.audio_region()));
        }
 
+       trackview.editor ().get_selection ().clear_points ();
        alist->erase (cp.model());
 
        trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
@@ -108,6 +108,6 @@ AudioRegionGainLine::region_changed (const PropertyChange& what_changed)
        interesting_stuff.add (ARDOUR::Properties::position);
 
        if (what_changed.contains (interesting_stuff)) {
-               _time_converter->set_origin_b (rv.region()->position() - rv.region()->start());
+               _time_converter->set_origin_b (rv.region()->position());
        }
 }