Merged with trunk R1141

[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 bba9410ffba344e4a4a4121eba9993e61e2625c6..3374d44655eb56a88bcc7fdfc5d53f9934f4a6a4 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"
@@ -46,9 +47,10 @@ 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().get()), &rv.audio_region()->get_state(), 0));
+                rv.audio_region()->set_envelope_active(false);
+       } 
 }
 
 // This is an extended copy from AutomationList
@@ -60,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());
-
-       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);
-       }
-
+        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_redo_no_execute (get_memento());
+       trackview.editor.current_session()->add_command (new MementoCommand<AutomationList>(alist, &before, &alist.get_state()));
        trackview.editor.current_session()->commit_reversible_command ();
        trackview.editor.current_session()->set_dirty ();
 }
@@ -78,17 +81,11 @@ 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().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();
-}