Merged with trunk R861

Possible new bugs - not very thoroughly tested, but at least functional at first glance


git-svn-id: svn://localhost/ardour2/branches/midi@870 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 11 insertions, 11 deletions

diff --git a/gtk2_ardour/region_gain_line.cc b/gtk2_ardour/region_gain_line.cc
index e2b1d6c826..467f24bd94 100644
--- a/gtk2_ardour/region_gain_line.cc
+++ b/gtk2_ardour/region_gain_line.cc
@@ -47,9 +47,9 @@ 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);
 	}
 }
 
@@ -64,11 +64,11 @@ 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 &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().get()), &before, &after));
 	}
 
 	alist.erase (mr.start, mr.end);
@@ -81,9 +81,9 @@ 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);
 }