X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_gain_line.cc;h=61f7dde0c706c1b9c323bf101579895f6c14779e;hb=e11b3f90c2d02735a071d526d67cfd0de90cbac3;hp=629981312131418fcbc78f979d734efc2534c34a;hpb=24ccaac67e9d416b3f3c564a441934313f3e9a21;p=ardour.git

diff --git a/gtk2_ardour/region_gain_line.cc b/gtk2_ardour/region_gain_line.cc
index 6299813121..61f7dde0c7 100644
--- 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>
 
@@ -43,25 +43,14 @@ AudioRegionGainLine::AudioRegionGainLine (const string & name, Session& s, Audio
 	  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) 
 {
@@ -102,7 +91,7 @@ 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);