Fix note range toggling (ie actually change visible range when menu option selected). Still some issue with initial value...

Don't raise tempo lines to top on editor canvas, they steal events.  Same problem on time canvas, but harder to solve...


git-svn-id: svn://localhost/ardour2/trunk@2255 d708f5d6-7413-0410-9779-e7cbd77b26cf

3 files changed, 29 insertions, 5 deletions

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 3d26df3f3a..09133a8823 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -193,11 +193,12 @@ Editor::draw_measures ()
 	tempo_lines->draw(*current_bbt_points, frames_per_unit);
 	marker_tempo_lines->draw(*current_bbt_points, frames_per_unit);
 
-	/* the cursors are always on top of everything */
-
-	time_line_group->raise_to_top();
+	/*time_line_group->raise_to_top();
+	time_line_group->lower(1);*/
 	marker_time_line_group->raise_to_top();
+	//marker_time_line_group->lower(1);
 
+	/* the cursors are always on top of everything */
 	cursor_group->raise_to_top();
 
 	return;
diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index 2008c56a49..c81cce65d6 100644
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -57,7 +57,7 @@ MidiStreamView::MidiStreamView (MidiTimeAxisView& tv)
 	: StreamView (tv)
 	, _range(ContentsRange)
 	, _lowest_note(60)
-	, _highest_note(71)
+	, _highest_note(60)
 {
 	if (tv.is_track())
 		stream_base_color = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get();
@@ -189,6 +189,14 @@ MidiStreamView::redisplay_diskstream ()
 	if (_trackview.is_midi_track()) {
 		_trackview.get_diskstream()->playlist()->foreach_region (static_cast<StreamView*>(this), &StreamView::add_region_view);
 	}
+
+	/* Always display at least one octave */
+	if (_highest_note == 127) {
+		if (_lowest_note > (127 - 11))
+			_lowest_note = 127 - 11;
+	} else if (_highest_note < _lowest_note + 11) {
+		_highest_note = _lowest_note + 11;
+	}
 	
 	for (i = region_views.begin(); i != region_views.end(); ) {
 		tmp = i;
@@ -238,6 +246,21 @@ MidiStreamView::draw_note_separators()
 		}
 	}
 }
+	
+
+void
+MidiStreamView::set_note_range(VisibleNoteRange r)
+{
+	_range = r;
+	if (r == FullRange) {
+		_lowest_note = 0;
+		_highest_note = 127;
+	} else {
+		_lowest_note = 60;
+		_highest_note = 60;
+	}
+	redisplay_diskstream();
+}
 
 	
 void 
diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h
index 6ba2b7146f..567844e678 100644
--- a/gtk2_ardour/midi_streamview.h
+++ b/gtk2_ardour/midi_streamview.h
@@ -66,7 +66,7 @@ class MidiStreamView : public StreamView
 	};
 
 	VisibleNoteRange note_range() { return _range; }
-	void set_note_range(VisibleNoteRange r) { _range = r; }
+	void set_note_range(VisibleNoteRange r);
 
 	uint8_t lowest_note()  const { return (_range == FullRange) ? 0 : _lowest_note; }
 	uint8_t highest_note() const { return (_range == FullRange) ? 127 : _highest_note; }