X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_gain_line.cc;h=b3dea4f42adf20fc339347f07fb3164164b43430;hb=3b4beb03b2a92ebfd1a9610b822360135c18038d;hp=bba9410ffba344e4a4a4121eba9993e61e2625c6;hpb=7ff370e79895d7eb293e7214689b791bd98415fb;p=ardour.git

diff --git a/gtk2_ardour/region_gain_line.cc b/gtk2_ardour/region_gain_line.cc
index bba9410ffb..b3dea4f42a 100644
--- a/gtk2_ardour/region_gain_line.cc
+++ b/gtk2_ardour/region_gain_line.cc
@@ -1,53 +1,62 @@
-#include <ardour/curve.h>
-#include <ardour/audioregion.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"
 
 #include "region_gain_line.h"
-#include "regionview.h"
+#include "audio_region_view.h"
 #include "utils.h"
 
 #include "time_axis_view.h"
 #include "editor.h"
 
-#include <ardour/session.h>
-
+#include "ardour/session.h"
 
 #include "i18n.h"
 
-
 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),
-	  session (s),
-	  rv (r)
+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);
+	group->property_y() = 2;
+	set_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, 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_undo( bind( mem_fun(rv.region, &AudioRegion::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);
 	}
 }
 
@@ -59,36 +68,31 @@ AudioRegionGainLine::remove_point (ControlPoint& cp)
 
 	model_representation (cp, mr);
 
-	trackview.editor.current_session()->begin_reversible_command (_("remove control point"));
-	trackview.editor.current_session()->add_undo (get_memento());
+	trackview.editor().current_session()->begin_reversible_command (_("remove control point"));
+	XMLNode &before = alist->get_state();
 
-	if (!rv.region.envelope_active()) {
-		trackview.session().add_undo( bind( mem_fun(rv.region, &AudioRegion::set_envelope_active), false) );
-		trackview.session().add_redo( bind( mem_fun(rv.region, &AudioRegion::set_envelope_active), true) );
-		rv.region.set_envelope_active(true);
+	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);
+	alist->erase (mr.start, mr.end);
 
-	trackview.editor.current_session()->add_redo_no_execute (get_memento());
-	trackview.editor.current_session()->commit_reversible_command ();
-	trackview.editor.current_session()->set_dirty ();
+	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 ();
 }
 
 void
-AudioRegionGainLine::end_drag (ControlPoint* cp) 
+AudioRegionGainLine::end_drag (ControlPoint* cp)
 {
-	if (!rv.region.envelope_active()) {
-		trackview.session().add_redo( bind( mem_fun(rv.region, &AudioRegion::set_envelope_active), true) );
-		rv.region.set_envelope_active(true);
+	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();
-}