Tidy up region gain line drawing slightly so that it doesn't overhang its region...

[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..1e23c2c55df8210f3ea4dd1e4ccd246199091f53 100644 (file)
--- a/gtk2_ardour/region_gain_line.cc
+++ b/gtk2_ardour/region_gain_line.cc
@@ -1,3 +1,22 @@
+/*
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <ardour/curve.h>
 #include <ardour/audioregion.h>
 #include <pbd/memento_command.h>
@@ -25,6 +44,7 @@ AudioRegionGainLine::AudioRegionGainLine (const string & name, Session& s, Audio
          rv (r)
 {
        group->raise_to_top ();
+       group->property_y() = 2;
        set_verbose_cursor_uses_gain_mapping (true);
        terminal_points_can_slide = false;
 }
@@ -40,17 +60,19 @@ AudioRegionGainLine::view_to_model_y (double& y)
 void
 AudioRegionGainLine::model_to_view_y (double& y)
 {
+       if (y < 0) y = 0;
+
        y = gain_to_slider_position (y);
 }
 
 void
-AudioRegionGainLine::start_drag (ControlPoint* cp, float fraction) 
+AudioRegionGainLine::start_drag (ControlPoint* cp, nframes_t x, 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);
-       }
+       AutomationLine::start_drag (cp, x, fraction);
+       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
@@ -62,18 +84,18 @@ AudioRegionGainLine::remove_point (ControlPoint& cp)
        model_representation (cp, mr);
 
        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));
-       }
-
+        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_command (new MementoCommand<AudioRegionGainLine>(*this, &before, &get_state()));
+       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 ();
 }
@@ -81,17 +103,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();
-}