many changes related to region zooming; proto-visual state undo/redo stack; fill-tracks command steals "f" (follow-playhead now on shift-f

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

1 files changed, 9 insertions, 20 deletions

diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc
index e6ef9e40a8..dae674a4f5 100644
--- a/gtk2_ardour/editor_route_list.cc
+++ b/gtk2_ardour/editor_route_list.cc
@@ -68,7 +68,6 @@ Editor::handle_new_route (Session::RouteList& routes)
 		row[route_display_columns.route] = route;
 		row[route_display_columns.text] = route->name();
 		row[route_display_columns.visible] = tv->marked_for_display();
-		row[route_display_columns.temporary_visible] = tv->marked_for_display();
 		row[route_display_columns.tv] = tv;
 
 		track_views.push_back (tv);
@@ -173,19 +172,20 @@ Editor::route_name_changed (TimeAxisView *tv)
 			break;
 		}
 	} 
-
 }
 
 void
-Editor::toggle_temporarily_hidden_tracks (bool yn)
+Editor::update_route_visibility ()
 {
 	TreeModel::Children rows = route_display_model->children();
 	TreeModel::Children::iterator i;
 	
 	no_route_list_redisplay = true;
-	
+
 	for (i = rows.begin(); i != rows.end(); ++i) {
-		(*i)[route_display_columns.temporary_visible] = yn;
+		TimeAxisView *tv = (*i)[route_display_columns.tv];
+		bool v = (*i)[route_display_columns.visible];
+		(*i)[route_display_columns.visible] = tv->marked_for_display ();
 	}
 
 	no_route_list_redisplay = false;
@@ -200,10 +200,10 @@ Editor::hide_track_in_display (TimeAxisView& tv, bool temponly)
 
 	for (i = rows.begin(); i != rows.end(); ++i) {
 		if ((*i)[route_display_columns.tv] == &tv) { 
-			if (!temponly) {
-				(*i)[route_display_columns.visible] = false;
+			(*i)[route_display_columns.visible] = false;
+			if (temponly) {
+				tv.set_marked_for_display (false);
 			}
-			(*i)[route_display_columns.temporary_visible] = false;
 			break;
 		}
 	}
@@ -225,7 +225,6 @@ Editor::show_track_in_display (TimeAxisView& tv)
 	for (i = rows.begin(); i != rows.end(); ++i) {
 		if ((*i)[route_display_columns.tv] == &tv) { 
 			(*i)[route_display_columns.visible] = true;
-			(*i)[route_display_columns.temporary_visible] = true;
 			tv.set_marked_for_display (true);
 			break;
 		}
@@ -300,11 +299,7 @@ Editor::redisplay_route_list ()
 
 		if (visible) {
 			tv->set_marked_for_display (true);
-			if ((*i)[route_display_columns.temporary_visible]) {
-				position += tv->show_at (position, n, &edit_controls_vbox);
-			} else {
-				tv->hide ();
-			}
+			position += tv->show_at (position, n, &edit_controls_vbox);
 		} else {
 			tv->hide ();
 		}
@@ -346,7 +341,6 @@ Editor::hide_all_tracks (bool with_select)
 		}
 		
 		row[route_display_columns.visible] = false;
-		row[route_display_columns.temporary_visible] = false;
 	}
 
 	no_route_list_redisplay = false;
@@ -397,7 +391,6 @@ Editor::set_all_tracks_visibility (bool yn)
 		}
 		
 		(*i)[route_display_columns.visible] = yn;
-		(*i)[route_display_columns.temporary_visible] = yn;
 	}
 
 	no_route_list_redisplay = false;
@@ -425,20 +418,17 @@ Editor::set_all_audio_visibility (int tracks, bool yn)
 			switch (tracks) {
 			case 0:
 				(*i)[route_display_columns.visible] = yn;
-				(*i)[route_display_columns.temporary_visible] = yn;
 				break;
 
 			case 1:
 				if (atv->is_audio_track()) {
 					(*i)[route_display_columns.visible] = yn;
-					(*i)[route_display_columns.temporary_visible] = yn;
 				}
 				break;
 				
 			case 2:
 				if (!atv->is_audio_track()) {
 					(*i)[route_display_columns.visible] = yn;
-					(*i)[route_display_columns.temporary_visible] = yn;
 				}
 				break;
 			}
@@ -508,7 +498,6 @@ Editor::route_list_display_button_press (GdkEventButton* ev)
 			if (tv) {
 				bool visible = (*iter)[route_display_columns.visible];
 				(*iter)[route_display_columns.visible] = !visible;
-				(*iter)[route_display_columns.temporary_visible] = !visible;
 			}
 		}
 		return true;