Merge all the (disconcertingly missing) track/region/etc height changes from 2.0.

Fix track y positioning and initial region size/location.
Fix automation click-to-add-points (i.e. points actually show up where you click).
Fancy whiz-bang dynamic resize 2.0 professional edition support for MIDI/CC/Automation tracks/regions.


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

1 files changed, 7 insertions, 8 deletions

diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 53e182c8d6..caaa5744f1 100644
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -452,12 +452,11 @@ AudioStreamView::redisplay_diskstream ()
 
 		xi = tmpx;
 	}
+	
+	/* now fix layering */
 
-	/* Fix canvas layering */
-	for (RegionViewList::iterator j = copy.begin(); j != copy.end(); ++j) {
-		(*j)->enable_display(true);
-		(*j)->set_height (height);
-		region_layered (*j);
+	for (RegionViewList::iterator i = copy.begin(); i != copy.end(); ++i) {
+		region_layered (*i);
 	}
 }
 
@@ -814,14 +813,14 @@ AudioStreamView::color_handler ()
 }
 
 void
-AudioStreamView::update_contents_y_position_and_height ()
+AudioStreamView::update_contents_height ()
 {
-	StreamView::update_contents_y_position_and_height ();
+	StreamView::update_contents_height ();
 	
 	for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
 		if (layer_display == Overlaid) {
 			(*i)->show ();
-			(*i)->set_y_position_and_height (0, height);
+			(*i)->set_height (height);
 		} else {
 			(*i)->hide ();
 		}