Fix binding of automation list undo records to MIDI sources. Should fix the remainder of #3203.

git-svn-id: svn://localhost/ardour2/branches/3.0@7411 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 56 insertions, 13 deletions

diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index ed94b03355..da76e0abd5 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -218,7 +218,9 @@ AutomationLine::modify_point_y (ControlPoint& cp, double y)
 	double const x = trackview.editor().frame_to_unit (_time_converter.to((*cp.model())->when));
 
 	trackview.editor().session()->begin_reversible_command (_("automation event move"));
-	trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), &get_state(), 0));
+	trackview.editor().session()->add_command (
+		new MementoCommand<AutomationList> (memento_command_binder(), &get_state(), 0)
+		);
 
 	cp.move_to (x, y, ControlPoint::Full);
 	reset_line_coords (cp);
@@ -233,7 +235,10 @@ AutomationLine::modify_point_y (ControlPoint& cp, double y)
 
 	update_pending = false;
 
-	trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), 0, &alist->get_state()));
+	trackview.editor().session()->add_command (
+		new MementoCommand<AutomationList> (memento_command_binder(), 0, &alist->get_state())
+		);
+	
 	trackview.editor().session()->commit_reversible_command ();
 	trackview.editor().session()->set_dirty ();
 }
@@ -568,7 +573,9 @@ void
 AutomationLine::start_drag_single (ControlPoint* cp, double x, float fraction)
 {
 	trackview.editor().session()->begin_reversible_command (_("automation event move"));
-	trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), &get_state(), 0));
+	trackview.editor().session()->add_command (
+		new MementoCommand<AutomationList> (memento_command_binder(), &get_state(), 0)
+		);
 
 	_drag_points.clear ();
 	_drag_points.push_back (cp);
@@ -593,7 +600,9 @@ void
 AutomationLine::start_drag_line (uint32_t i1, uint32_t i2, float fraction)
 {
 	trackview.editor().session()->begin_reversible_command (_("automation range move"));
-	trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), &get_state(), 0));
+	trackview.editor().session()->add_command (
+		new MementoCommand<AutomationList> (memento_command_binder (), &get_state(), 0)
+		);
 
 	_drag_points.clear ();
 	for (uint32_t i = i1; i <= i2; i++) {
@@ -611,7 +620,9 @@ void
 AutomationLine::start_drag_multiple (list<ControlPoint*> cp, float fraction, XMLNode* state)
 {
 	trackview.editor().session()->begin_reversible_command (_("automation range move"));
-	trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), state, 0));
+	trackview.editor().session()->add_command (
+		new MementoCommand<AutomationList> (memento_command_binder(), state, 0)
+		);
 
 	_drag_points = cp;
 	start_drag_common (0, fraction);
@@ -778,7 +789,10 @@ AutomationLine::end_drag ()
 
 	update_pending = false;
 
-	trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), 0, &alist->get_state()));
+	trackview.editor().session()->add_command (
+		new MementoCommand<AutomationList>(memento_command_binder (), 0, &alist->get_state())
+		);
+	
 	trackview.editor().session()->commit_reversible_command ();
 	trackview.editor().session()->set_dirty ();
 }
@@ -924,8 +938,10 @@ AutomationLine::remove_point (ControlPoint& cp)
 
 	alist->erase (mr.start, mr.end);
 
-	trackview.editor().session()->add_command(new MementoCommand<AutomationList>(
-			*alist.get(), &before, &alist->get_state()));
+	trackview.editor().session()->add_command(
+		new MementoCommand<AutomationList> (memento_command_binder (), &before, &alist->get_state())
+		);
+	
 	trackview.editor().session()->commit_reversible_command ();
 	trackview.editor().session()->set_dirty ();
 }
@@ -1107,7 +1123,11 @@ AutomationLine::clear ()
 	/* parent must create command */
 	XMLNode &before = alist->get_state();
 	alist->clear();
-	trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*(alist.get()), &before, &alist->get_state()));
+
+	trackview.editor().session()->add_command (
+		new MementoCommand<AutomationList> (memento_command_binder (), &before, &alist->get_state())
+		);
+	
 	trackview.editor().session()->commit_reversible_command ();
 	trackview.editor().session()->set_dirty ();
 }
@@ -1311,3 +1331,9 @@ AutomationLine::connect_to_list ()
 		_list_connections, invalidator (*this), boost::bind (&AutomationLine::interpolation_changed, this, _1), gui_context()
 		);
 }
+
+MementoCommandBinder<AutomationList>*
+AutomationLine::memento_command_binder ()
+{
+	return new SimpleMementoCommandBinder<AutomationList> (*alist.get());
+}
diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 161d33a80b..efc25eb84b 100644
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -34,6 +34,7 @@
 
 #include "pbd/undo.h"
 #include "pbd/statefuldestructible.h"
+#include "pbd/memento_command.h"
 
 #include "ardour/automation_list.h"
 #include "ardour/types.h"
@@ -131,6 +132,8 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 	void add_always_in_view (double);
 	void clear_always_in_view ();
 
+	virtual MementoCommandBinder<ARDOUR::AutomationList>* memento_command_binder ();
+
   protected:
 
 	std::string    _name;
diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc
index 9f3d169dde..feb40c3ddf 100644
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -22,10 +22,13 @@
 #include "ardour/event_type_map.h"
 #include "ardour/session.h"
 #include "ardour/source.h"
+#include "ardour/midi_automation_list_binder.h"
+#include "ardour/midi_region.h"
 
 #include "automation_region_view.h"
 #include "gui_thread.h"
 #include "public_editor.h"
+#include "midi_automation_line.h"
 
 #include "i18n.h"
 
@@ -71,9 +74,12 @@ AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/)
 void
 AutomationRegionView::create_line (boost::shared_ptr<ARDOUR::AutomationList> list)
 {
-	_line = boost::shared_ptr<AutomationLine>(new AutomationLine(
+	_line = boost::shared_ptr<AutomationLine> (new MidiAutomationLine(
 				ARDOUR::EventTypeMap::instance().to_symbol(list->parameter()),
-				trackview, *get_canvas_group(), list, &_time_converter));
+				trackview, *get_canvas_group(), list,
+				boost::dynamic_pointer_cast<ARDOUR::MidiRegion> (_region),
+				_parameter,
+				&_time_converter));
 	_line->set_colors();
 	_line->set_height ((uint32_t)rint(trackview.current_height() - NAME_HIGHLIGHT_SIZE));
 	_line->show();
@@ -130,8 +136,15 @@ AutomationRegionView::add_automation_event (GdkEvent *, nframes_t when, double y
 	_line->the_list()->add (when_d, y);
 
 	XMLNode& after = _line->the_list()->get_state();
-	view->session()->commit_reversible_command (new MementoCommand<ARDOUR::AutomationList>(
-			*_line->the_list(), &before, &after));
+
+	/* XXX: hack! */
+	boost::shared_ptr<ARDOUR::MidiRegion> mr = boost::dynamic_pointer_cast<ARDOUR::MidiRegion> (_region);
+	assert (mr);
+	
+	view->session()->commit_reversible_command (
+		new MementoCommand<ARDOUR::AutomationList> (new ARDOUR::MidiAutomationListBinder (mr->midi_source(), _parameter), &before, &after)
+		);
+	
 
 	view->session()->set_dirty ();
 }
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 940d43d5b4..80e54ef231 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -127,6 +127,7 @@ gtk2_ardour_sources = [
 	'location_ui.cc',
 	'main.cc',
 	'marker.cc',
+	'midi_automation_line.cc',
 	'midi_channel_selector.cc',
 	'midi_cut_buffer.cc',
 	'midi_list_editor.cc',