Merged with trunk R776

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

1 files changed, 75 insertions, 100 deletions

diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 02a88b578b..7025a11178 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -1,4 +1,5 @@
 #include <ardour/route.h>
+#include <pbd/memento_command.h>
 
 #include "ardour_ui.h"
 #include "automation_time_axis.h"
@@ -40,6 +41,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 	auto_write_item = 0;
 	auto_play_item = 0;
 	ignore_state_request = false;
+	first_call_to_set_height = true;
 
 	//	base_rect = gnome_canvas_item_new (GNOME_CANVAS_GROUP(canvas_display),
 	//			 gnome_canvas_simplerect_get_type(),
@@ -72,6 +74,8 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 	clear_button.set_name ("TrackVisualButton");
 	hide_button.set_name ("TrackRemoveButton");
 
+	controls_table.set_no_show_all();
+
 	ARDOUR_UI::instance()->tooltips().set_tip(height_button, _("track height"));
 	ARDOUR_UI::instance()->tooltips().set_tip(auto_button, _("automation state"));
 	ARDOUR_UI::instance()->tooltips().set_tip(clear_button, _("clear track"));
@@ -98,7 +102,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 		}
 	}
 	name_label.set_text (shortpname);
-	name_label.set_alignment (1.0, 0.5);
+	name_label.set_alignment (Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
 
 	if (nomparent.length()) {
 
@@ -114,7 +118,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 
  		plugname = new Label (pname);
 		plugname->set_name (X_("TrackPlugName"));
-		plugname->set_alignment (1.0, 0.5);
+		plugname->show();
 		name_label.set_name (X_("TrackParameterName"));
 		controls_table.remove (name_hbox);
 		controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
@@ -138,8 +142,8 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 	controls_table.attach (hide_button, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
 	controls_table.attach (height_button, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
 
-	controls_table.attach (auto_button, 6, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-	controls_table.attach (clear_button, 6, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+	controls_table.attach (auto_button, 5, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+	controls_table.attach (clear_button, 5, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
 
 	controls_table.show_all ();
 
@@ -281,11 +285,11 @@ AutomationTimeAxisView::set_height (TrackHeight ht)
 	uint32_t h = height_to_pixels (ht);
 	bool changed = (height != (uint32_t) h);
 
+	bool changed_between_small_and_normal = ( (ht == Small || ht == Smaller) ^ (height_style == Small || height_style == Smaller) );
+
 	TimeAxisView* state_parent = get_parent_with_state ();
 	XMLNode* xml_node = state_parent->get_child_xml_node (_state_name);
 
-	//controls_table.show_all ();
-
 	TimeAxisView::set_height (ht);
 	base_rect->property_y2() = h;
 
@@ -297,117 +301,88 @@ AutomationTimeAxisView::set_height (TrackHeight ht)
 		(*i)->set_height ();
 	}
 
+
 	switch (ht) {
 	case Largest:
 		xml_node->add_property ("track_height", "largest");
-		controls_table.remove (name_hbox);
-		if (plugname) {
-			if (plugname_packed) {
-				controls_table.remove (*plugname);
-				plugname_packed = false;
-			}
-			controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-			plugname_packed = true;
-			controls_table.attach (name_hbox, 1, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-		} else {
-			controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-		}
-		controls_table.show_all ();
-
-		hide_name_entry ();
-		show_name_label ();
 		break;
 
 	case Large:
 		xml_node->add_property ("track_height", "large");
-		controls_table.remove (name_hbox);
-		if (plugname) {
-			if (plugname_packed) {
-				controls_table.remove (*plugname);
-				plugname_packed = false;
-			}
-			controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-			plugname_packed = true;
-		} else {
-			controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-		}
-		controls_table.show_all ();
-		hide_name_entry ();
-		show_name_label ();
 		break;
 
 	case Larger:
 		xml_node->add_property ("track_height", "larger");
-		controls_table.remove (name_hbox);
-		if (plugname) {
-			if (plugname_packed) {
-				controls_table.remove (*plugname);
-				plugname_packed = false;
-			}
-			controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-			plugname_packed = true;
-		} else {
-			controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-		}
-		controls_table.show_all ();
-		hide_name_entry ();
-		show_name_label ();
 		break;
 
 	case Normal:
 		xml_node->add_property ("track_height", "normal");
-		controls_table.remove (name_hbox);
-		if (plugname) {
-			if (plugname_packed) {
-				controls_table.remove (*plugname);
-				plugname_packed = false;
-			}
-			controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-			plugname_packed = true;
-			controls_table.attach (name_hbox, 1, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-		} else {
-			controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-		}
-		controls_table.show_all ();
-		hide_name_entry ();
-		show_name_label ();
 		break;
 
 	case Smaller:
 		xml_node->add_property ("track_height", "smaller");
-		controls_table.remove (name_hbox);
-		if (plugname) {
-			if (plugname_packed) {
-				controls_table.remove (*plugname);
-				plugname_packed = false;
-			}
-		}
-		controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-		controls_table.hide_all ();
-		hide_name_entry ();
-		show_name_label ();
-		name_hbox.show_all ();
-		controls_table.show ();
 		break;
 
 	case Small:
 		xml_node->add_property ("track_height", "small");
-		controls_table.remove (name_hbox);
-		if (plugname) {
-			if (plugname_packed) {
-				controls_table.remove (*plugname);
-				plugname_packed = false;
-			}
-		} 
-		controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-		controls_table.hide_all ();
-		hide_name_entry ();
-		show_name_label ();
-		name_hbox.show_all ();
-		controls_table.show ();
 		break;
 	}
 
+	if (changed_between_small_and_normal || first_call_to_set_height) {
+		first_call_to_set_height = false;
+		switch (ht) {
+			case Largest:
+			case Large:
+			case Larger:
+			case Normal:
+
+				controls_table.remove (name_hbox);
+
+				if (plugname) {
+					if (plugname_packed) {
+						controls_table.remove (*plugname);
+						plugname_packed = false;
+					}
+					controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+					plugname_packed = true;
+					controls_table.attach (name_hbox, 1, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+				} else {
+					controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+				}
+				hide_name_entry ();
+				show_name_label ();
+				name_hbox.show_all ();
+
+				auto_button.show();
+				height_button.show();
+				clear_button.show();
+				hide_button.show_all();
+				break;
+
+			case Smaller:
+			case Small:
+
+				controls_table.remove (name_hbox);
+				if (plugname) {
+					if (plugname_packed) {
+						controls_table.remove (*plugname);
+						plugname_packed = false;
+					}
+				}
+				controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+				controls_table.hide_all ();
+				hide_name_entry ();
+				show_name_label ();
+				name_hbox.show_all ();
+
+				auto_button.hide();
+				height_button.hide();
+				clear_button.hide();
+				hide_button.hide();
+				break;
+		}
+	}
+
 	if (changed) {
 		/* only emit the signal if the height really changed */
 		route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
@@ -501,13 +476,13 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel
 	AutomationList& alist (line.the_list());
 	bool ret = false;
 
-	_session.add_undo (alist.get_memento());
+        XMLNode &before = alist.get_state();
 
 	switch (op) {
 	case Cut:
 		if ((what_we_got = alist.cut (selection.time.front().start, selection.time.front().end)) != 0) {
 			editor.get_cut_buffer().add (what_we_got);
-			_session.add_redo_no_execute (alist.get_memento());
+			_session.add_command(new MementoCommand<AutomationList>(alist, before, alist.get_state()));
 			ret = true;
 		}
 		break;
@@ -519,7 +494,7 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel
 
 	case Clear:
 		if ((what_we_got = alist.cut (selection.time.front().start, selection.time.front().end)) != 0) {
-			_session.add_redo_no_execute (alist.get_memento());
+			_session.add_command(new MementoCommand<AutomationList>(alist, before, alist.get_state()));
 			delete what_we_got;
 			what_we_got = 0;
 			ret = true;
@@ -551,7 +526,7 @@ AutomationTimeAxisView::reset_objects_one (AutomationLine& line, PointSelection&
 {
 	AutomationList& alist (line.the_list());
 
-	_session.add_undo (alist.get_memento());
+	_session.add_command (new MementoUndoCommand<AutomationList>(alist, alist.get_state()));
 
 	for (PointSelection::iterator i = selection.begin(); i != selection.end(); ++i) {
 
@@ -582,7 +557,7 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS
 	AutomationList& alist (line.the_list());
 	bool ret = false;
 
-	_session.add_undo (alist.get_memento());
+        XMLNode &before = alist.get_state();
 
 	for (PointSelection::iterator i = selection.begin(); i != selection.end(); ++i) {
 
@@ -594,7 +569,7 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS
 		case Cut:
 			if ((what_we_got = alist.cut ((*i).start, (*i).end)) != 0) {
 				editor.get_cut_buffer().add (what_we_got);
-				_session.add_redo_no_execute (alist.get_memento());
+				_session.add_command (new MementoCommand<AutomationList>(alist, before, alist.get_state()));
 				ret = true;
 			}
 			break;
@@ -606,7 +581,7 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS
 			
 		case Clear:
 			if ((what_we_got = alist.cut ((*i).start, (*i).end)) != 0) {
-				_session.add_redo_no_execute (alist.get_memento());
+				_session.add_command (new MementoCommand<AutomationList>(alist, before, alist.get_state()));
 				delete what_we_got;
 				what_we_got = 0;
 				ret = true;
@@ -663,9 +638,9 @@ AutomationTimeAxisView::paste_one (AutomationLine& line, jack_nframes_t pos, flo
 		(*x)->value = foo;
 	}
 
-	_session.add_undo (alist.get_memento());
+        XMLNode &before = alist.get_state();
 	alist.paste (copy, pos, times);
-	_session.add_redo_no_execute (alist.get_memento());
+	_session.add_command (new MementoCommand<AutomationList>(alist, before, alist.get_state()));
 
 	return true;
 }