merge with master, primarily for adrian's maximise-mixer change

[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 0d72afefe91aa4cbb45aa47df3d432012e119eb8..827ebde12d9babf60af2ef7092be4958796b9504 100644 (file)
--- a/gtk2_ardour/region_gain_line.cc
+++ b/gtk2_ardour/region_gain_line.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    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
@@ -17,10 +17,14 @@
 
 */
 
-#include <ardour/curve.h>
-#include <ardour/audioregion.h>
-#include <pbd/memento_command.h>
+#include "evoral/Curve.hpp"
+#include "pbd/memento_command.h"
+#include "pbd/stateful_diff_command.h"
 
+#include "ardour/audioregion.h"
+#include "ardour/session.h"
+
+#include "control_point.h"
 #include "region_gain_line.h"
 #include "audio_region_view.h"
 #include "utils.h"
@@ -28,84 +32,68 @@
 #include "time_axis_view.h"
 #include "editor.h"
 
-#include <ardour/session.h>
-
-
 #include "i18n.h"
 
-
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-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)
+AudioRegionGainLine::AudioRegionGainLine (const string & name, AudioRegionView& r, ArdourCanvas::Group& parent, boost::shared_ptr<AutomationList> l)
+       : AutomationLine (name, r.get_time_axis_view(), parent, l)
+       , rv (r)
 {
+       // If this isn't true something is horribly wrong, and we'll get catastrophic gain values
+       assert(l->parameter().type() == EnvelopeAutomation);
+
+       _time_converter->set_origin_b (r.region()->position() - r.region()->start());
+
        group->raise_to_top ();
-       set_verbose_cursor_uses_gain_mapping (true);
+       group->set_y_position (2);
+       set_uses_gain_mapping (true);
        terminal_points_can_slide = false;
 }
 
 void
-AudioRegionGainLine::view_to_model_y (double& y)
+AudioRegionGainLine::start_drag_single (ControlPoint* cp, double x, float fraction)
 {
-       y = slider_position_to_gain (y);
-       y = max (0.0, y);
-       y = min (2.0, y);
-}
+       AutomationLine::start_drag_single (cp, x, fraction);
 
-void
-AudioRegionGainLine::model_to_view_y (double& y)
-{
-       y = gain_to_slider_position (y);
-}
+        // XXX Stateful need to capture automation curve data
 
-void
-AudioRegionGainLine::start_drag (ControlPoint* cp, nframes_t x, float fraction) 
-{
-       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);
-       } 
+               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
 void
 AudioRegionGainLine::remove_point (ControlPoint& cp)
 {
-       ModelRepresentation mr;
-
-       model_representation (cp, mr);
-
-       trackview.editor.current_session()->begin_reversible_command (_("remove control point"));
-        XMLNode &before = alist.get_state();
+       trackview.editor().session()->begin_reversible_command (_("remove control point"));
+       XMLNode &before = alist->get_state();
 
        if (!rv.audio_region()->envelope_active()) {
-                XMLNode &region_before = rv.audio_region()->get_state();
+                rv.audio_region()->clear_changes ();
                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<AutomationList>(alist, &before, &alist.get_state()));
-       trackview.editor.current_session()->commit_reversible_command ();
-       trackview.editor.current_session()->set_dirty ();
+               trackview.session()->add_command(new StatefulDiffCommand (rv.audio_region()));
+       }
+
+       alist->erase (cp.model());
+
+       trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
+       trackview.editor().session()->commit_reversible_command ();
+       trackview.editor().session()->set_dirty ();
 }
 
 void
-AudioRegionGainLine::end_drag (ControlPoint* cp) 
+AudioRegionGainLine::end_drag (bool with_push, uint32_t final_index)
 {
        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()));
-       } 
+               trackview.session()->add_command(new MementoCommand<AudioRegion>(*(rv.audio_region().get()), 0, &rv.audio_region()->get_state()));
+       }
 
-       AutomationLine::end_drag(cp);
+       AutomationLine::end_drag (with_push, final_index);
 }
 
-