X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_gain_line.cc;h=629981312131418fcbc78f979d734efc2534c34a;hb=823a1d36c1694a220b3b581741ffc92990e03eeb;hp=2faa63151bf9442a7d0a5dc26eb5444145b6ef6c;hpb=6aeb09062f4b4ff8e684f6f5ba80d47cb69665d5;p=ardour.git

diff --git a/gtk2_ardour/region_gain_line.cc b/gtk2_ardour/region_gain_line.cc
index 2faa63151b..6299813121 100644
--- a/gtk2_ardour/region_gain_line.cc
+++ b/gtk2_ardour/region_gain_line.cc
@@ -1,8 +1,28 @@
+/*
+    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 <ardour/curve.h>
 #include <ardour/audioregion.h>
+#include <pbd/memento_command.h>
 
 #include "region_gain_line.h"
-#include "regionview.h"
+#include "audio_region_view.h"
 #include "utils.h"
 
 #include "time_axis_view.h"
@@ -18,8 +38,8 @@ 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)
 {
@@ -43,13 +63,13 @@ AudioRegionGainLine::model_to_view_y (double& y)
 }
 
 void
-AudioRegionGainLine::start_drag (ControlPoint* cp, float fraction) 
+AudioRegionGainLine::start_drag (ControlPoint* cp, nframes_t x, float fraction) 
 {
-	AutomationLine::start_drag(cp,fraction);
-	if (!rv.region.envelope_active()) {
-                trackview.session().add_command(MementoUndoCommand<AudioRegion>(rv.region, rv.region.get_state()));
-                rv.region.set_envelope_active(false);
-	}
+	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);
+	} 
 }
 
 // This is an extended copy from AutomationList
@@ -61,18 +81,18 @@ AudioRegionGainLine::remove_point (ControlPoint& cp)
 	model_representation (cp, mr);
 
 	trackview.editor.current_session()->begin_reversible_command (_("remove control point"));
-        XMLNode &before = get_state();
-
-	if (!rv.region.envelope_active()) {
-                XMLNode &before = rv.region.get_state();
-		rv.region.set_envelope_active(true);
-                XMLNode &after = rv.region.get_state();
-                trackview.session().add_command(MementoCommand<AudioRegion>(rv.region, before, after));
-	}
-
-	alist.erase (mr.start, mr.end);
-
-	trackview.editor.current_session()->add_command (MementoCommand<AudioRegionGainLine>(*this, before, get_state()));
+	XMLNode &before = alist->get_state();
+
+	if (!rv.audio_region()->envelope_active()) {
+		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));
+	} 
+	
+	alist->erase (mr.start, mr.end);
+
+	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 ();
 }
@@ -80,17 +100,11 @@ AudioRegionGainLine::remove_point (ControlPoint& cp)
 void
 AudioRegionGainLine::end_drag (ControlPoint* cp) 
 {
-	if (!rv.region.envelope_active()) {
-		rv.region.set_envelope_active(true);
-                trackview.session().add_command(MementoRedoCommand<AudioRegion>(rv.region, rv.region.get_state()));
-	}
+	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(cp);
 }
 
-
-// This is a copy from AutomationList
-UndoAction
-AudioRegionGainLine::get_memento ()
-{
-	return alist.get_memento();
-}