r257@gwythaint (orig r797): fugalh | 2006-08-12 15:49:20 -0600

[ardour.git] / gtk2_ardour / region_gain_line.cc

diff --git a/gtk2_ardour/region_gain_line.cc b/gtk2_ardour/region_gain_line.cc
index dbd4a58fc08986a702013621777b6afacbb6db94..e2b1d6c8265b694ea7ec9a3944c7dc6e29d33e6e 100644 (file)
--- a/gtk2_ardour/region_gain_line.cc
+++ b/gtk2_ardour/region_gain_line.cc
@@ -1,8 +1,9 @@
 #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"
@@ -16,8 +17,9 @@
 
 using namespace std;
 using namespace ARDOUR;
+using namespace PBD;
 
-AudioRegionGainLine::AudioRegionGainLine (string name, Session& s, AudioRegionView& r, ArdourCanvas::Group& parent, Curve& c)
+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)
@@ -45,8 +47,9 @@ void
 AudioRegionGainLine::start_drag (ControlPoint* cp, 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) );
+       if (!rv.audio_region().envelope_active()) {
+                trackview.session().add_command(new MementoCommand<AudioRegion>(rv.audio_region(), &rv.audio_region().get_state(), 0));
+                rv.audio_region().set_envelope_active(false);
        }
 }
 
@@ -59,17 +62,18 @@ 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());
+        XMLNode &before = 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 &before = rv.audio_region().get_state();
+               rv.audio_region().set_envelope_active(true);
+                XMLNode &after = rv.audio_region().get_state();
+                trackview.session().add_command(new MementoCommand<AudioRegion>(rv.audio_region(), &before, &after));
        }
 
        alist.erase (mr.start, mr.end);
 
-       trackview.editor.current_session()->add_redo_no_execute (get_memento());
+       trackview.editor.current_session()->add_command (new MementoCommand<AudioRegionGainLine>(*this, &before, &get_state()));
        trackview.editor.current_session()->commit_reversible_command ();
        trackview.editor.current_session()->set_dirty ();
 }
@@ -77,9 +81,9 @@ AudioRegionGainLine::remove_point (ControlPoint& cp)
 void
 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(), 0, &rv.audio_region().get_state()));
        }
        AutomationLine::end_drag(cp);
 }