X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_gain_line.cc;h=61f7dde0c706c1b9c323bf101579895f6c14779e;hb=d8ade6d30595a3a8be343b392e47d422940eac27;hp=6354763c0975f3ef9912b53d9f9708c448efa67a;hpb=71c94e69438c7c282b2dcac5ead080119944b290;p=ardour.git

diff --git a/gtk2_ardour/region_gain_line.cc b/gtk2_ardour/region_gain_line.cc
index 6354763c09..61f7dde0c7 100644
--- a/gtk2_ardour/region_gain_line.cc
+++ b/gtk2_ardour/region_gain_line.cc
@@ -1,4 +1,23 @@
-#include <ardour/curve.h>
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <evoral/Curve.hpp>
 #include <ardour/audioregion.h>
 #include <pbd/memento_command.h>
 
@@ -19,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)
+AudioRegionGainLine::start_drag (ControlPoint* cp, nframes_t x, float fraction) 
 {
-	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, float fraction) 
-{
-	AutomationLine::start_drag(cp,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);
 	} 
 }
 
@@ -62,18 +70,18 @@ AudioRegionGainLine::remove_point (ControlPoint& cp)
 	model_representation (cp, mr);
 
 	trackview.editor.current_session()->begin_reversible_command (_("remove control point"));
-        XMLNode &before = 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<AudioRegionGainLine>(*this, &before, &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 ();
 }
@@ -83,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);
 }
 
-