use ustring more; handle embedding of "paired" files as per mantis #1362

[ardour.git] / gtk2_ardour / redirect_automation_time_axis.cc

diff --git a/gtk2_ardour/redirect_automation_time_axis.cc b/gtk2_ardour/redirect_automation_time_axis.cc
index d6e243233886d2d5d474cc52b04c2346ae2ef4f6..529c0b565da3e1e22d815ff37f81703e6feb7dc8 100644 (file)
--- a/gtk2_ardour/redirect_automation_time_axis.cc
+++ b/gtk2_ardour/redirect_automation_time_axis.cc
@@ -21,6 +21,7 @@
 #include <ardour/redirect.h>
 #include <ardour/session.h>
 #include <cstdlib>
+#include <pbd/memento_command.h>
 
 #include "redirect_automation_time_axis.h"
 #include "automation_line.h"
@@ -32,7 +33,8 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
 
-RedirectAutomationTimeAxisView::RedirectAutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& parent, Canvas& canvas, std::string n,
+RedirectAutomationTimeAxisView::RedirectAutomationTimeAxisView (Session& s, boost::shared_ptr<Route> r, 
+                                                               PublicEditor& e, TimeAxisView& parent, Canvas& canvas, std::string n,
                                                                uint32_t prt, Redirect& rd, string state_name)
 
        : AxisView (s),
@@ -72,7 +74,7 @@ RedirectAutomationTimeAxisView::~RedirectAutomationTimeAxisView ()
 }
 
 void
-RedirectAutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent* event, jack_nframes_t when, double y)
+RedirectAutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent* event, nframes_t when, double y)
 {
        double x = 0;
 
@@ -97,11 +99,10 @@ RedirectAutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item,
                lines.front()->view_to_model_y (y);
                
                _session.begin_reversible_command (description);
-                XMLNode &before, &after;
-                before = alist.get_state();
+                XMLNode &before = alist.get_state();
                alist.add (when, y);
-                after = alist.get_state();
-                _session.add_command(MementoCommand<AutomationList>(alist, before, after));
+                XMLNode &after = alist.get_state();
+                _session.add_command(new MementoCommand<AutomationList>(alist, &before, &after));
                _session.commit_reversible_command ();
                _session.set_dirty ();
        }