Increase maximum note height to 20 (10 is far too small a target for individual note editing).

Fix broken whitespace.


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

1 files changed, 49 insertions, 48 deletions

diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index fd3d5383aa..2fb3bba597 100644
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -64,7 +64,7 @@ MidiStreamView::MidiStreamView (MidiTimeAxisView& tv)
 	, _highest_note(71)
 	, _data_note_min(60)
 	, _data_note_max(71)
-        , _note_lines (0)
+	, _note_lines (0)
 	, _updates_suspended (false)
 {
 	/* use a group dedicated to MIDI underlays. Audio underlays are not in this group. */
@@ -73,16 +73,18 @@ MidiStreamView::MidiStreamView (MidiTimeAxisView& tv)
 
 	/* put the note lines in the timeaxisview's group, so it
 	   can be put below ghost regions from MIDI underlays*/
-	_note_lines = new ArdourCanvas::LineSet(*_canvas_group, ArdourCanvas::LineSet::Horizontal);
+	_note_lines = new ArdourCanvas::LineSet(*_canvas_group,
+	                                        ArdourCanvas::LineSet::Horizontal);
 
 	_note_lines->property_x1() = 0;
 	_note_lines->property_y1() = 0;
 	_note_lines->property_x2() = DBL_MAX;
 	_note_lines->property_y2() = 0;
 
-	_note_lines->signal_event().connect(sigc::bind(
-			sigc::mem_fun(_trackview.editor(), &PublicEditor::canvas_stream_view_event),
-			_note_lines, &_trackview));
+	_note_lines->signal_event().connect(
+		sigc::bind(sigc::mem_fun(_trackview.editor(),
+		                         &PublicEditor::canvas_stream_view_event),
+		           _note_lines, &_trackview));
 
 	_note_lines->lower_to_bottom();
 
@@ -94,7 +96,7 @@ MidiStreamView::MidiStreamView (MidiTimeAxisView& tv)
 	note_range_adjustment.set_value(_lowest_note);
 
 	note_range_adjustment.signal_value_changed().connect(
-			sigc::mem_fun(*this, &MidiStreamView::note_range_adjustment_changed));
+		sigc::mem_fun(*this, &MidiStreamView::note_range_adjustment_changed));
 }
 
 MidiStreamView::~MidiStreamView ()
@@ -137,8 +139,8 @@ MidiStreamView::create_region_view (boost::shared_ptr<Region> r, bool /*wfd*/, b
 	}
 
 	RegionView* region_view = new MidiRegionView (_canvas_group, _trackview, region,
-						      _samples_per_unit, region_color);
-	
+	                                              _samples_per_unit, region_color);
+
 	region_view->init (region_color, false);
 
 	return region_view;
@@ -173,11 +175,11 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wfd,
 
 	region_views.push_front (region_view);
 
-        if (_trackview.editor().internal_editing()) {
-                region_view->hide_rect ();
-        } else {
-                region_view->show_rect ();
-        }
+	if (_trackview.editor().internal_editing()) {
+		region_view->hide_rect ();
+	} else {
+		region_view->show_rect ();
+	}
 
 	/* display events and find note range */
 	display_region (region_view, wfd);
@@ -195,7 +197,7 @@ MidiStreamView::display_region(MidiRegionView* region_view, bool load_model)
 {
 	if (!region_view) {
 		return;
-        }
+	}
 
 	region_view->enable_display(true);
 
@@ -206,8 +208,8 @@ MidiStreamView::display_region(MidiRegionView* region_view, bool load_model)
 	}
 
 	_range_dirty = update_data_note_range(
-			source->model()->lowest_note(),
-			source->model()->highest_note());
+		source->model()->lowest_note(),
+		source->model()->highest_note());
 
 	// Display region contents
 	region_view->set_height (child_height());
@@ -220,7 +222,7 @@ MidiStreamView::display_track (boost::shared_ptr<Track> tr)
 	StreamView::display_track (tr);
 
 	draw_note_lines();
-	
+
 	NoteRangeChanged();
 }
 
@@ -231,8 +233,8 @@ MidiStreamView::update_contents_metrics(boost::shared_ptr<Region> r)
 	if (mr) {
 		mr->midi_source(0)->load_model();
 		_range_dirty = update_data_note_range(
-				mr->model()->lowest_note(),
-				mr->model()->highest_note());
+			mr->model()->lowest_note(),
+			mr->model()->highest_note());
 	}
 }
 
@@ -265,8 +267,7 @@ MidiStreamView::redisplay_track ()
 	_data_note_min = 127;
 	_data_note_max = 0;
 	_trackview.track()->playlist()->foreach_region(
-		sigc::mem_fun (*this, &StreamView::update_contents_metrics)
-		);
+		sigc::mem_fun (*this, &StreamView::update_contents_metrics));
 
 	// No notes, use default range
 	if (!_range_dirty) {
@@ -288,8 +289,7 @@ MidiStreamView::redisplay_track ()
 
 	// Add and display region views, and flag them as valid
 	_trackview.track()->playlist()->foreach_region(
-		sigc::hide_return (sigc::mem_fun (*this, &StreamView::add_region_view))
-		);
+		sigc::hide_return (sigc::mem_fun (*this, &StreamView::add_region_view)));
 
 	// Stack regions by layer, and remove invalid regions
 	layer_regions();
@@ -305,22 +305,22 @@ MidiStreamView::update_contents_height ()
 	StreamView::update_contents_height();
 	_note_lines->property_y2() = child_height ();
 
-        apply_note_range (lowest_note(), highest_note(), true);
+	apply_note_range (lowest_note(), highest_note(), true);
 }
 
 void
 MidiStreamView::draw_note_lines()
 {
-        if (!_note_lines || _updates_suspended) {
-                return;
-        }
+	if (!_note_lines || _updates_suspended) {
+		return;
+	}
 
 	double y;
 	double prev_y = contents_height();
 	uint32_t color;
 
 	_note_lines->clear();
-	
+
 	if (child_height() < 140){
 		return;
 	}
@@ -373,18 +373,19 @@ MidiStreamView::apply_note_range(uint8_t lowest, uint8_t highest, bool to_region
 	_highest_note = highest;
 	_lowest_note = lowest;
 
-	int const range = _highest_note - _lowest_note;  
+	int const max_note_height = 20;  // This should probably be based on text size...
+	int const range = _highest_note - _lowest_note;
 	int const pixels_per_note = floor (child_height () / range);
-	
+
 	/* do not grow note height beyond 10 pixels */
-	if (pixels_per_note > 10) {
-		
-		int const available_note_range = floor (child_height() / 10);
+	if (pixels_per_note > max_note_height) {
+
+		int const available_note_range = floor (child_height() / max_note_height);
 		int additional_notes = available_note_range - range;
-		
+
 		/* distribute additional notes to higher and lower ranges, clamp at 0 and 127 */
 		for (int i = 0; i < additional_notes; i++){
-			
+
 			if (i % 2 && _highest_note < 127){
 				_highest_note++;
 			}
@@ -399,16 +400,16 @@ MidiStreamView::apply_note_range(uint8_t lowest, uint8_t highest, bool to_region
 			}
 		}
 	}
-	
+
 	note_range_adjustment.set_page_size(_highest_note - _lowest_note);
 	note_range_adjustment.set_value(_lowest_note);
-	
+
 	draw_note_lines();
 
 	if (to_region_views) {
 		apply_note_range_to_regions ();
 	}
-	
+
 	NoteRangeChanged();
 }
 
@@ -456,16 +457,16 @@ MidiStreamView::setup_rec_box ()
 				framepos_t start = 0;
 				if (rec_regions.size() > 0) {
 					start = rec_regions.back().first->start()
-							+ _trackview.track()->get_captured_frames(rec_regions.size()-1);
+						+ _trackview.track()->get_captured_frames(rec_regions.size()-1);
 				}
 
 				if (!rec_regions.empty()) {
 					MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (rec_regions.back().second);
 					mrv->end_write ();
 				}
-				
-				PropertyList plist; 
-				
+
+				PropertyList plist;
+
 				plist.add (ARDOUR::Properties::start, start);
 				plist.add (ARDOUR::Properties::length, 1);
 				/* Just above we're setting this nascent region's length to 1.  I think this
@@ -485,7 +486,7 @@ MidiStreamView::setup_rec_box ()
 				plist.add (ARDOUR::Properties::layer, 0);
 
 				boost::shared_ptr<MidiRegion> region (boost::dynamic_pointer_cast<MidiRegion>
-								      (RegionFactory::create (sources, plist, false)));
+				                                      (RegionFactory::create (sources, plist, false)));
 
 				assert(region);
 				region->set_start (_trackview.track()->current_capture_start() - _trackview.track()->get_capture_start_frame (0), this);
@@ -533,13 +534,13 @@ MidiStreamView::setup_rec_box ()
 
 			screen_update_connection.disconnect();
 			screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (
-					sigc::mem_fun (*this, &MidiStreamView::update_rec_box));
+				sigc::mem_fun (*this, &MidiStreamView::update_rec_box));
 			rec_updating = true;
 			rec_active = true;
 
 		} else if (rec_active &&
-			   (_trackview.session()->record_status() != Session::Recording ||
-			    !_trackview.track()->record_enabled())) {
+		           (_trackview.session()->record_status() != Session::Recording ||
+		            !_trackview.track()->record_enabled())) {
 			screen_update_connection.disconnect();
 			rec_active = false;
 			rec_updating = false;
@@ -590,7 +591,7 @@ MidiStreamView::setup_rec_box ()
 void
 MidiStreamView::color_handler ()
 {
-        draw_note_lines ();
+	draw_note_lines ();
 
 	if (_trackview.is_midi_track()) {
 		canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get();
@@ -655,7 +656,7 @@ MidiStreamView::y_to_note (double y) const
 	} else if (n > 127) {
 		return 127;
 	}
-	
+
 	return n;
 }