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, 6 insertions, 7 deletions

diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index 2266ddd064..8d2986b6de 100644
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -218,7 +218,7 @@ MidiStreamView::redisplay_diskstream ()
 			continue;
 		} else {
 			(*i)->enable_display(true);
-			(*i)->set_y_position_and_height(0, height); // apply note range
+			(*i)->set_height(height); // apply note range
 		}
 		
 		/* Sort regionviews by layer so that when we call region_layered ()
@@ -256,8 +256,7 @@ MidiStreamView::redisplay_diskstream ()
 	
 	/* Fix canvas layering */
 	for (RegionViewList::iterator j = copy.begin(); j != copy.end(); ++j) {
-		(*j)->enable_display(true);
-		(*j)->set_height (height);
+		(*j)->enable_display(true); // FIXME: do this?
 		region_layered (*j);
 	}
 	
@@ -270,9 +269,9 @@ MidiStreamView::redisplay_diskstream ()
 
 
 void
-MidiStreamView::update_contents_y_position_and_height ()
+MidiStreamView::update_contents_height ()
 {
-	StreamView::update_contents_y_position_and_height();
+	StreamView::update_contents_height();
 	_note_lines->property_y2() = height;
 	draw_note_lines();
 }
@@ -338,7 +337,7 @@ MidiStreamView::set_note_range(uint8_t lowest, uint8_t highest) {
 
 		list<RegionView *>::iterator i;
 		for (i = region_views.begin(); i != region_views.end(); ++i) {
-			(*i)->set_y_position_and_height(0, height); // apply note range
+			(*i)->set_height(height); // apply note range
 		}
 	}
 
@@ -610,7 +609,7 @@ MidiStreamView::update_rec_regions (boost::shared_ptr<MidiModel> data, nframes_t
 		}
 
 		if (update_range)
-			update_contents_y_position_and_height();
+			update_contents_height();
 	}
 }