fixes for 2 of 3 "fit-tracks" problems; new feature: 12 "view-states" and bindings etc. to support them

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3313 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 12 insertions, 6 deletions

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index f47e0ec33f..18a0d12199 100644
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -169,15 +169,21 @@ AudioTimeAxisView::set_state (const XMLNode& node)
 	if ((ret = TimeAxisView::set_state (node)) != 0) {
 		return ret;
 	}
-	
-	if ((prop = node.property ("shown_editor")) != 0) {
-		if (prop->value() == "no") {
-			_marked_for_display = false;
+
+	/* if the TimeAxisView had marked this not for display,
+	   then do not allow this to override it.
+	*/
+
+	if ((prop = node.property ("marked_for_display")) == 0) {
+		if ((prop = node.property ("shown_editor")) != 0) {
+			if (prop->value() == "no") {
+				_marked_for_display = false;
+			} else {
+				_marked_for_display = true;
+			}
 		} else {
 			_marked_for_display = true;
 		}
-	} else {
-		_marked_for_display = true;
 	}
 	
 	XMLNodeList nlist = node.children();