Tidy.

[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 0d72afefe91aa4cbb45aa47df3d432012e119eb8..61f7dde0c706c1b9c323bf101579895f6c14779e 100644 (file)
--- a/gtk2_ardour/region_gain_line.cc
+++ b/gtk2_ardour/region_gain_line.cc
@@ -17,7 +17,7 @@
 
 */
 
-#include <ardour/curve.h>
+#include <evoral/Curve.hpp>
 #include <ardour/audioregion.h>
 #include <pbd/memento_command.h>
 
@@ -38,37 +38,26 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-AudioRegionGainLine::AudioRegionGainLine (const string & name, Session& s, AudioRegionView& r, ArdourCanvas::Group& parent, Curve& c)
-  : AutomationLine (name, r.get_time_axis_view(), parent, c),
+AudioRegionGainLine::AudioRegionGainLine (const string & name, Session& s, 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);
+
        group->raise_to_top ();
        set_verbose_cursor_uses_gain_mapping (true);
        terminal_points_can_slide = false;
 }
 
-void
-AudioRegionGainLine::view_to_model_y (double& y)
-{
-       y = slider_position_to_gain (y);
-       y = max (0.0, y);
-       y = min (2.0, y);
-}
-
-void
-AudioRegionGainLine::model_to_view_y (double& y)
-{
-       y = gain_to_slider_position (y);
-}
-
 void
 AudioRegionGainLine::start_drag (ControlPoint* cp, nframes_t x, float fraction) 
 {
        AutomationLine::start_drag (cp, x, fraction);
        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);
+               trackview.session().add_command(new MementoCommand<AudioRegion>(*(rv.audio_region().get()), &rv.audio_region()->get_state(), 0));
+               rv.audio_region()->set_envelope_active(false);
        } 
 }
 
@@ -81,18 +70,18 @@ AudioRegionGainLine::remove_point (ControlPoint& cp)
        model_representation (cp, mr);
 
        trackview.editor.current_session()->begin_reversible_command (_("remove control point"));
-        XMLNode &before = alist.get_state();
+       XMLNode &before = alist->get_state();
 
        if (!rv.audio_region()->envelope_active()) {
-                XMLNode &region_before = rv.audio_region()->get_state();
+               XMLNode &region_before = rv.audio_region()->get_state();
                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));
+               XMLNode &region_after = rv.audio_region()->get_state();
+               trackview.session().add_command(new MementoCommand<AudioRegion>(*(rv.audio_region().get()), &region_before, &region_after));
        } 
        
-       alist.erase (mr.start, mr.end);
+       alist->erase (mr.start, mr.end);
 
-       trackview.editor.current_session()->add_command (new MementoCommand<AutomationList>(alist, &before, &alist.get_state()));
+       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 ();
 }
@@ -102,10 +91,9 @@ AudioRegionGainLine::end_drag (ControlPoint* cp)
 {
        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);
 }
 
-