first pass on track mode switch; fixes to dangling region refs after capture; destroy...

[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 e2b1d6c8265b694ea7ec9a3944c7dc6e29d33e6e..6354763c0975f3ef9912b53d9f9708c448efa67a 100644 (file)
--- a/gtk2_ardour/region_gain_line.cc
+++ b/gtk2_ardour/region_gain_line.cc
@@ -47,10 +47,10 @@ void
 AudioRegionGainLine::start_drag (ControlPoint* cp, float fraction) 
 {
        AutomationLine::start_drag(cp,fraction);
-       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);
-       }
+       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
@@ -64,13 +64,13 @@ AudioRegionGainLine::remove_point (ControlPoint& cp)
        trackview.editor.current_session()->begin_reversible_command (_("remove control point"));
         XMLNode &before = get_state();
 
-       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));
-       }
-
+       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<AudioRegionGainLine>(*this, &before, &get_state()));
@@ -81,17 +81,12 @@ AudioRegionGainLine::remove_point (ControlPoint& cp)
 void
 AudioRegionGainLine::end_drag (ControlPoint* cp) 
 {
-       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()));
-       }
+       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();
-}