X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_gain_line.cc;h=30e19ec24a13efd122d0acda44dd6513393e0e83;hb=6fbaa5403bcefba3186fb5490017e110210122e3;hp=2528e350fc9279d3589e51c081884d5493d59b09;hpb=042997e5ed35778c5309b6119ca1dcf8f696c3cc;p=ardour.git

diff --git a/gtk2_ardour/region_gain_line.cc b/gtk2_ardour/region_gain_line.cc
index 2528e350fc..30e19ec24a 100644
--- a/gtk2_ardour/region_gain_line.cc
+++ b/gtk2_ardour/region_gain_line.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    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
@@ -17,9 +17,12 @@
 
 */
 
-#include <evoral/Curve.hpp>
-#include <ardour/audioregion.h>
-#include <pbd/memento_command.h>
+#include "evoral/Curve.hpp"
+#include "pbd/memento_command.h"
+#include "pbd/stateful_diff_command.h"
+
+#include "ardour/audioregion.h"
+#include "ardour/session.h"
 
 #include "region_gain_line.h"
 #include "audio_region_view.h"
@@ -28,37 +31,36 @@
 #include "time_axis_view.h"
 #include "editor.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, boost::shared_ptr<AutomationList> l)
-  : AutomationLine (name, r.get_time_axis_view(), parent, l),
-	  session (s),
-	  rv (r)
+AudioRegionGainLine::AudioRegionGainLine (const string & name, AudioRegionView& r, ArdourCanvas::Group& parent, boost::shared_ptr<AutomationList> l)
+	: AutomationLine (name, r.get_time_axis_view(), parent, l)
+	, 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 ();
+	group->property_y() = 2;
 	set_uses_gain_mapping (true);
 	terminal_points_can_slide = false;
 }
 
 void
-AudioRegionGainLine::start_drag (ControlPoint* cp, nframes_t x, float fraction) 
+AudioRegionGainLine::start_drag_single (ControlPoint* cp, double x, float fraction)
 {
-	AutomationLine::start_drag (cp, x, fraction);
+	AutomationLine::start_drag_single (cp, x, fraction);
+
+        // XXX Stateful need to capture automation curve data
+	
 	if (!rv.audio_region()->envelope_active()) {
-		trackview.session().add_command(new MementoCommand<AudioRegion>(*(rv.audio_region().get()), &rv.audio_region()->get_state(), 0));
+		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
@@ -69,31 +71,30 @@ AudioRegionGainLine::remove_point (ControlPoint& cp)
 
 	model_representation (cp, mr);
 
-	trackview.editor().current_session()->begin_reversible_command (_("remove control point"));
+	trackview.editor().session()->begin_reversible_command (_("remove control point"));
 	XMLNode &before = alist->get_state();
 
 	if (!rv.audio_region()->envelope_active()) {
-		XMLNode &region_before = rv.audio_region()->get_state();
+                rv.audio_region()->clear_history ();
 		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));
-	} 
-	
+		trackview.session()->add_command(new StatefulDiffCommand (rv.audio_region()));
+	}
+
 	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 ();
+	trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
+	trackview.editor().session()->commit_reversible_command ();
+	trackview.editor().session()->set_dirty ();
 }
 
 void
-AudioRegionGainLine::end_drag (ControlPoint* cp) 
+AudioRegionGainLine::end_drag ()
 {
 	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);
+	AutomationLine::end_drag ();
 }