X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_streamview.cc;h=723b52220210e0b3e28e972af24e6a5632135a94;hb=459eda7e11e4b8fa9767dc8a3e2b1228dc54078e;hp=5f939ab58306a5a3c15db4521c9ffe5f52790cab;hpb=d752986314eb37151983393c1d62efefe503e47c;p=ardour.git

diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index 5f939ab583..723b522202 100644
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001, 2006 Paul Davis 
+    Copyright (C) 2001-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,401 +18,600 @@
 
 #include <cmath>
 #include <cassert>
+#include <utility>
 
 #include <gtkmm.h>
 
 #include <gtkmm2ext/gtk_ui.h>
 
-#include <ardour/midi_playlist.h>
-#include <ardour/midi_region.h>
-#include <ardour/midi_source.h>
-#include <ardour/midi_diskstream.h>
-#include <ardour/midi_track.h>
-//#include <ardour/playlist_templates.h>
-#include <ardour/midi_source.h>
+#include "ardour/midi_diskstream.h"
+#include "ardour/midi_playlist.h"
+#include "ardour/midi_region.h"
+#include "ardour/midi_source.h"
+#include "ardour/midi_track.h"
+#include "ardour/region_factory.h"
+#include "ardour/smf_source.h"
+#include "ardour/session.h"
 
-#include "midi_streamview.h"
-#include "region_view.h"
+#include "ardour_ui.h"
+#include "canvas-simplerect.h"
+#include "global_signals.h"
+#include "gui_thread.h"
+#include "lineset.h"
 #include "midi_region_view.h"
+#include "midi_streamview.h"
 #include "midi_time_axis.h"
-#include "canvas-simplerect.h"
-#include "region_selection.h"
-#include "selection.h"
+#include "midi_util.h"
 #include "public_editor.h"
-#include "ardour_ui.h"
+#include "region_selection.h"
+#include "region_view.h"
 #include "rgb_macros.h"
-#include "gui_thread.h"
+#include "selection.h"
+#include "simplerect.h"
 #include "utils.h"
-#include "color.h"
 
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Editing;
 
 MidiStreamView::MidiStreamView (MidiTimeAxisView& tv)
 	: StreamView (tv)
+	, note_range_adjustment(0.0f, 0.0f, 0.0f)
+	, _range_dirty(false)
+	, _range_sum_cache(-1.0)
+	, _lowest_note(60)
+	, _highest_note(71)
+	, _data_note_min(60)
+	, _data_note_max(71)
+        , _note_lines (0)
 {
-	if (tv.is_track())
-		stream_base_color = color_map[cMidiTrackBase];
-	else
-		stream_base_color = color_map[cMidiBusBase];
-	
-	canvas_rect->property_fill_color_rgba() = stream_base_color;
-	canvas_rect->property_outline_color_rgba() = color_map[cAudioTrackOutline];
+	/* use a group dedicated to MIDI underlays. Audio underlays are not in this group. */
+	midi_underlay_group = new ArdourCanvas::Group (*_canvas_group);
+	midi_underlay_group->lower_to_bottom();
+
+	/* 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->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->lower_to_bottom();
+
+	color_handler ();
+
+	ColorsChanged.connect(sigc::mem_fun(*this, &MidiStreamView::color_handler));
 
-	//use_rec_regions = tv.editor.show_waveforms_recording ();
-	use_rec_regions = true;
+	note_range_adjustment.set_page_size(_highest_note - _lowest_note);
+	note_range_adjustment.set_value(_lowest_note);
+
+	note_range_adjustment.signal_value_changed().connect(
+			sigc::mem_fun(*this, &MidiStreamView::note_range_adjustment_changed));
 }
 
 MidiStreamView::~MidiStreamView ()
 {
 }
 
+static void
+veto_note_range(uint8_t& min, uint8_t& max)
+{
+	/* Legal notes, thanks */
+	clamp_to_0_127(min);
+	clamp_to_0_127(max);
+
+	/* Always display at least one octave in [0, 127] */
+	if (max == 127) {
+		if (min > (127 - 11)) {
+			min = 127 - 11;
+		}
+	} else if (max < min + 11) {
+		uint8_t d = 11 - (max - min);
+		if (max + d/2 > 127) {
+			min -= d;
+		} else {
+			min -= d / 2;
+			max += d / 2;
+		}
+	}
+	assert(max - min >= 11);
+	assert(max <= 127);
+	assert(min <= 127);
+}
 
-void
-MidiStreamView::add_region_view_internal (Region *r, bool wait_for_waves)
+RegionView*
+MidiStreamView::create_region_view (boost::shared_ptr<Region> r, bool /*wfd*/, bool)
 {
-	ENSURE_GUI_THREAD (bind (mem_fun (*this, &MidiStreamView::add_region_view), r));
+	boost::shared_ptr<MidiRegion> region = boost::dynamic_pointer_cast<MidiRegion> (r);
+
+	if (region == 0) {
+		return 0;
+	}
 
-	MidiRegion* region = dynamic_cast<MidiRegion*> (r);
+	RegionView* region_view = new MidiRegionView (_canvas_group, _trackview, region,
+						      _samples_per_unit, region_color);
+	
+	region_view->init (region_color, false);
+
+	return region_view;
+}
+
+RegionView*
+MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wfd, bool recording)
+{
+	boost::shared_ptr<MidiRegion> region = boost::dynamic_pointer_cast<MidiRegion> (r);
 
 	if (region == 0) {
-		return;
+		return 0;
 	}
 
-	MidiRegionView *region_view;
-	list<RegionView *>::iterator i;
+	for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
+		if ((*i)->region() == r) {
 
-	for (i = region_views.begin(); i != region_views.end(); ++i) {
-		if (&(*i)->region() == r) {
-			
 			/* great. we already have a MidiRegionView for this Region. use it again. */
 
 			(*i)->set_valid (true);
-			return;
+
+			display_region(dynamic_cast<MidiRegionView*>(*i), wfd);
+
+			return 0;
 		}
 	}
-	
-	// can't we all just get along?
-	assert(_trackview.midi_track()->mode() != Destructive);
 
-	region_view = new MidiRegionView (canvas_group, _trackview, *region, 
-			_samples_per_unit, region_color);
+	MidiRegionView* region_view = dynamic_cast<MidiRegionView*> (create_region_view (r, wfd, recording));
+	if (region_view == 0) {
+		return 0;
+	}
 
-	region_view->init (region_color, wait_for_waves);
 	region_views.push_front (region_view);
-	
-	/* follow global waveform setting */
 
-	// FIXME
-	//region_view->set_waveform_visible(_trackview.editor.show_waveforms());
+	/* display events and find note range */
+	display_region (region_view, wfd);
 
 	/* catch regionview going away */
+	region->DropReferences.connect (*this, invalidator (*this), boost::bind (&MidiStreamView::remove_region_view, this, region), gui_context());
 
-	region->GoingAway.connect (mem_fun (*this, &MidiStreamView::remove_region_view));
-	
 	RegionViewAdded (region_view);
+
+	return region_view;
+}
+
+void
+MidiStreamView::display_region(MidiRegionView* region_view, bool load_model)
+{
+	if ( ! region_view)
+		return;
+
+	region_view->enable_display(true);
+
+	boost::shared_ptr<MidiSource> source(region_view->midi_region()->midi_source(0));
+
+	if (load_model) {
+		source->load_model();
+	}
+
+	_range_dirty = update_data_note_range(
+			source->model()->lowest_note(),
+			source->model()->highest_note());
+
+	// Display region contents
+	region_view->set_height (child_height());
+	region_view->display_model(source->model());
+}
+
+void
+MidiStreamView::display_track (boost::shared_ptr<Track> tr)
+{
+	StreamView::display_track (tr);
+
+	draw_note_lines();
+	
+	NoteRangeChanged();
 }
 
-// FIXME: code duplication with AudioStreamVIew
 void
-MidiStreamView::redisplay_diskstream ()
+MidiStreamView::update_contents_metrics(boost::shared_ptr<Region> r)
+{
+	boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(r);
+	if (mr) {
+		mr->midi_source(0)->load_model();
+		_range_dirty = update_data_note_range(
+				mr->model()->lowest_note(),
+				mr->model()->highest_note());
+	}
+}
+
+bool
+MidiStreamView::update_data_note_range(uint8_t min, uint8_t max)
 {
-	list<RegionView *>::iterator i, tmp;
+	bool dirty = false;
+	if (min < _data_note_min) {
+		_data_note_min = min;
+		dirty = true;
+	}
+	if (max > _data_note_max) {
+		_data_note_max = max;
+		dirty = true;
+	}
+	return dirty;
+}
+
+void
+MidiStreamView::redisplay_track ()
+{
+	if (!_trackview.is_midi_track()) {
+		return;
+	}
+
+	list<RegionView*>::iterator i;
+
+	// Load models if necessary, and find note range of all our contents
+	_range_dirty = false;
+	_data_note_min = 127;
+	_data_note_max = 0;
+	_trackview.track()->playlist()->foreach_region(
+		sigc::mem_fun (*this, &StreamView::update_contents_metrics)
+		);
+
+	// No notes, use default range
+	if (!_range_dirty) {
+		_data_note_min = 60;
+		_data_note_max = 71;
+	}
+
+	// Extend visible range to show newly recorded data, if necessary
+	_lowest_note  = std::min(_lowest_note, _data_note_min);
+	_highest_note = std::max(_highest_note, _data_note_max);
 
+	veto_note_range(_lowest_note, _highest_note);
+
+	// Flag region views as invalid and disable drawing
 	for (i = region_views.begin(); i != region_views.end(); ++i) {
-		(*i)->set_valid (false);
+		(*i)->set_valid(false);
+		(*i)->enable_display(false);
 	}
 
-	if (_trackview.is_midi_track()) {
-		_trackview.get_diskstream()->playlist()->foreach_region (static_cast<StreamView*>(this), &StreamView::add_region_view);
+	// 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))
+		);
+
+	// Stack regions by layer, and remove invalid regions
+	layer_regions();
+
+	// Update note range (not regions which are correct) and draw note lines
+	apply_note_range(_lowest_note, _highest_note, false);
+}
+
+
+void
+MidiStreamView::update_contents_height ()
+{
+	StreamView::update_contents_height();
+	_note_lines->property_y2() = child_height ();
+
+        apply_note_range (lowest_note(), highest_note(), true);
+}
+
+void
+MidiStreamView::draw_note_lines()
+{
+        if (!_note_lines) {
+                return;
+        }
+
+	double y;
+	double prev_y = contents_height();
+	uint32_t color;
+
+	_note_lines->clear();
+	
+	if (child_height() < 140){
+		return;
 	}
 
-	for (i = region_views.begin(); i != region_views.end(); ) {
-		tmp = i;
-		tmp++;
+	for (int i = lowest_note(); i <= highest_note(); ++i) {
+		y = floor(note_to_y(i));
+
+		_note_lines->add_line(prev_y, 1.0, ARDOUR_UI::config()->canvasvar_PianoRollBlackOutline.get());
+
+		switch (i % 12) {
+		case 1:
+		case 3:
+		case 6:
+		case 8:
+		case 10:
+			color = ARDOUR_UI::config()->canvasvar_PianoRollBlack.get();
+			break;
+		default:
+			color = ARDOUR_UI::config()->canvasvar_PianoRollWhite.get();
+			break;
+		}
+
+		if (i == highest_note()) {
+			_note_lines->add_line(y, prev_y - y, color);
+		} else {
+			_note_lines->add_line(y + 1.0, prev_y - y - 1.0, color);
+		}
+
+		prev_y = y;
+	}
+}
+
+void
+MidiStreamView::set_note_range(VisibleNoteRange r)
+{
+	if (r == FullRange) {
+		_lowest_note = 0;
+		_highest_note = 127;
+	} else {
+		_lowest_note = _data_note_min;
+		_highest_note = _data_note_max;
+	}
 
-		if (!(*i)->is_valid()) {
-			delete *i;
-			region_views.erase (i);
-		} 
+	apply_note_range(_lowest_note, _highest_note, true);
+}
 
-		i = tmp;
+void
+MidiStreamView::apply_note_range(uint8_t lowest, uint8_t highest, bool to_region_views)
+{
+	_highest_note = highest;
+	_lowest_note = lowest;
+	
+	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);
+		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++;
+			}
+			else if (i % 2) {
+				_lowest_note--;
+			}
+			else if (_lowest_note > 0){
+				_lowest_note--;
+			}
+			else {
+				_highest_note++;
+			}
+		}
 	}
+	
+	note_range_adjustment.set_page_size(_highest_note - _lowest_note);
+	note_range_adjustment.set_value(_lowest_note);
+	
+	draw_note_lines();
 
-	/* now fix layering */
+	if (to_region_views) {
+		for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
+			((MidiRegionView*)(*i))->apply_note_range(_lowest_note, _highest_note);
+		}
+	}
 
-	playlist_modified ();
+	NoteRangeChanged();
 }
 
+void
+MidiStreamView::update_note_range(uint8_t note_num)
+{
+	assert(note_num <= 127);
+	_data_note_min = min(_data_note_min, note_num);
+	_data_note_max = max(_data_note_max, note_num);
+}
 
 void
 MidiStreamView::setup_rec_box ()
 {
 	// cerr << _trackview.name() << " streamview SRB\n";
 
-	if (_trackview.session().transport_rolling()) {
-
-		cerr << "\tSHOW: rolling\n";
+	if (_trackview.session()->transport_rolling()) {
 
-		if (!rec_active && 
-		    _trackview.session().record_status() == Session::Recording && 
-		    _trackview.get_diskstream()->record_enabled()) {
+		if (!rec_active &&
+		    _trackview.session()->record_status() == Session::Recording &&
+		    _trackview.track()->record_enabled()) {
 
-			if (use_rec_regions && rec_regions.size() == rec_rects.size()) {
+			if (Config->get_show_waveforms_while_recording() && rec_regions.size() == rec_rects.size()) {
 
-				/* add a new region, but don't bother if they set use_rec_regions mid-record */
+				/* add a new region, but don't bother if they set show-waveforms-while-recording mid-record */
 
 				MidiRegion::SourceList sources;
 
-				// FIXME
-				MidiDiskstream* mds = dynamic_cast<MidiDiskstream*>(_trackview.get_diskstream());
-				assert(mds);
+				rec_data_ready_connections.drop_connections ();
 
-				sources.push_back((Source*)mds->write_source());
-				
-				// FIXME
-				rec_data_ready_connections.push_back (mds->write_source()->ViewDataRangeReady.connect (bind (mem_fun (*this, &MidiStreamView::rec_data_range_ready), mds->write_source()))); 
+				sources.push_back (_trackview.midi_track()->write_source());
 
 				// handle multi
-				
-				jack_nframes_t start = 0;
+
+				framepos_t start = 0;
 				if (rec_regions.size() > 0) {
-					start = rec_regions.back()->start() + _trackview.get_diskstream()->get_captured_frames(rec_regions.size()-1);
+					start = rec_regions.back().first->start()
+							+ _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 ();
 				}
 				
-				MidiRegion * region = new MidiRegion(sources, start, 1 , "", 0, (Region::Flag)(Region::DefaultFlags | Region::DoNotSaveState), false);
-				region->set_position (_trackview.session().transport_frame(), this);
-				rec_regions.push_back (region);
-				/* catch it if it goes away */
-				region->GoingAway.connect (mem_fun (*this, &MidiStreamView::remove_rec_region));
+				PropertyList plist; 
+				
+				plist.add (ARDOUR::Properties::start, start);
+				plist.add (ARDOUR::Properties::length, 1);
+				plist.add (ARDOUR::Properties::name, string());
+				plist.add (ARDOUR::Properties::layer, 0);
+
+				boost::shared_ptr<MidiRegion> region (boost::dynamic_pointer_cast<MidiRegion>
+								      (RegionFactory::create (sources, plist, false)));
+
+				assert(region);
+				region->set_start (_trackview.track()->current_capture_start() - _trackview.track()->get_capture_start_frame (0), this);
+				region->set_position (_trackview.track()->current_capture_start(), this);
+				RegionView* rv = add_region_view_internal (region, false);
+				MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (rv);
+				mrv->begin_write ();
+
+				rec_regions.push_back (make_pair (region, rv));
+
+				// rec regions are destroyed in setup_rec_box
 
 				/* we add the region later */
+
+				setup_new_rec_layer_time (region);
 			}
-			
+
 			/* start a new rec box */
 
-			MidiTrack* mt = _trackview.midi_track(); /* we know what it is already */
-			MidiDiskstream& ds = mt->midi_diskstream();
-			jack_nframes_t frame_pos = ds.current_capture_start ();
-			gdouble xstart = _trackview.editor.frame_to_pixel (frame_pos);
-			gdouble xend;
+			boost::shared_ptr<MidiTrack> mt = _trackview.midi_track(); /* we know what it is already */
+			framepos_t const frame_pos = mt->current_capture_start ();
+			gdouble const xstart = _trackview.editor().frame_to_pixel (frame_pos);
+			gdouble const xend = xstart;
 			uint32_t fill_color;
 
 			assert(_trackview.midi_track()->mode() == Normal);
-			
-			xend = xstart;
-			fill_color = color_map[cRecordingRectFill];
-			
-			ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*canvas_group);
+
+			fill_color = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
+
+			ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*_canvas_group);
 			rec_rect->property_x1() = xstart;
 			rec_rect->property_y1() = 1.0;
 			rec_rect->property_x2() = xend;
-			rec_rect->property_y2() = (double) _trackview.height - 1;
-			rec_rect->property_outline_color_rgba() = color_map[cRecordingRectOutline];
+			rec_rect->property_y2() = (double) _trackview.current_height() - 1;
+			rec_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
 			rec_rect->property_fill_color_rgba() = fill_color;
-			
+			rec_rect->lower_to_bottom();
+
 			RecBoxInfo recbox;
 			recbox.rectangle = rec_rect;
-			recbox.start = _trackview.session().transport_frame();
+			recbox.start = _trackview.session()->transport_frame();
 			recbox.length = 0;
-			
+
 			rec_rects.push_back (recbox);
-			
+
 			screen_update_connection.disconnect();
-			screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun (*this, &MidiStreamView::update_rec_box));	
+			screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (
+					sigc::mem_fun (*this, &MidiStreamView::update_rec_box));
 			rec_updating = true;
 			rec_active = true;
 
-			// Show, damn you!
-			rec_rect->show();
-			rec_rect->raise_to_top();
-
 		} else if (rec_active &&
-			   (_trackview.session().record_status() != Session::Recording ||
-			    !_trackview.get_diskstream()->record_enabled())) {
-
-			cerr << "NO SHOW 1\n";
-
+			   (_trackview.session()->record_status() != Session::Recording ||
+			    !_trackview.track()->record_enabled())) {
 			screen_update_connection.disconnect();
 			rec_active = false;
 			rec_updating = false;
-
 		}
-		
+
 	} else {
 
-		cerr << "\tNOT rolling, rec_rects = " << rec_rects.size() << " rec_regions = " << rec_regions.size() << endl;
+		// cerr << "\tNOT rolling, rec_rects = " << rec_rects.size() << " rec_regions = " << rec_regions.size() << endl;
 
 		if (!rec_rects.empty() || !rec_regions.empty()) {
 
 			/* disconnect rapid update */
 			screen_update_connection.disconnect();
-
-			for (list<sigc::connection>::iterator prc = rec_data_ready_connections.begin(); prc != rec_data_ready_connections.end(); ++prc) {
-				(*prc).disconnect();
-			}
-			rec_data_ready_connections.clear();
+			rec_data_ready_connections.drop_connections ();
 
 			rec_updating = false;
 			rec_active = false;
-			last_rec_data_frame = 0;
-			
+
 			/* remove temp regions */
-			for (list<Region*>::iterator iter=rec_regions.begin(); iter != rec_regions.end(); )
-			{
-				list<Region*>::iterator tmp;
+
+			for (list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end();) {
+				list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator tmp;
 
 				tmp = iter;
 				++tmp;
 
-				/* this will trigger the remove_region_view */
-				delete *iter;
+				(*iter).first->drop_references ();
 
 				iter = tmp;
 			}
-			
+
 			rec_regions.clear();
 
 			// cerr << "\tclear " << rec_rects.size() << " rec rects\n";
-		
 
 			/* transport stopped, clear boxes */
 			for (vector<RecBoxInfo>::iterator iter=rec_rects.begin(); iter != rec_rects.end(); ++iter) {
 				RecBoxInfo &rect = (*iter);
 				delete rect.rectangle;
 			}
-			
+
 			rec_rects.clear();
-			
+
 		}
 	}
 }
 
 void
-MidiStreamView::update_rec_regions ()
+MidiStreamView::color_handler ()
 {
-	if (use_rec_regions) {
-
-
-		uint32_t n = 0;
-
-		for (list<Region*>::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) {
-
-			list<Region*>::iterator tmp;
-
-			tmp = iter;
-			++tmp;
-
-			if (!canvas_item_visible (rec_rects[n].rectangle)) {
-				/* rect already hidden, this region is done */
-				iter = tmp;
-				continue;
-			}
-			
-			// FIXME
-			MidiRegion * region = dynamic_cast<MidiRegion*>(*iter);
-			assert(region);
-
-			jack_nframes_t origlen = region->length();
-
-			if (region == rec_regions.back() && rec_active) {
-
-				if (last_rec_data_frame > region->start()) {
-
-					jack_nframes_t nlen = last_rec_data_frame - region->start();
-
-					if (nlen != region->length()) {
-
-						region->freeze ();
-						region->set_position (_trackview.get_diskstream()->get_capture_start_frame(n), this);
-						region->set_length (nlen, this);
-						region->thaw ("updated");
+        draw_note_lines ();
 
-						if (origlen == 1) {
-							/* our special initial length */
-							add_region_view_internal (region, false);
-						}
-
-						/* also update rect */
-						ArdourCanvas::SimpleRect * rect = rec_rects[n].rectangle;
-						gdouble xend = _trackview.editor.frame_to_pixel (region->position() + region->length());
-						rect->property_x2() = xend;
-					}
-				}
-
-			} else {
-
-				jack_nframes_t nlen = _trackview.get_diskstream()->get_captured_frames(n);
-
-				if (nlen != region->length()) {
-
-					if (region->source(0).length() >= region->start() + nlen) {
-
-						region->freeze ();
-						region->set_position (_trackview.get_diskstream()->get_capture_start_frame(n), this);
-						region->set_length (nlen, this);
-						region->thaw ("updated");
-						
-						if (origlen == 1) {
-							/* our special initial length */
-							add_region_view_internal (region, false);
-						}
-						
-						/* also hide rect */
-						ArdourCanvas::Item * rect = rec_rects[n].rectangle;
-						rect->hide();
-
-					}
-				}
-			}
-
-			iter = tmp;
-		}
+	if (_trackview.is_midi_track()) {
+		canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get();
+	} else {
+		canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();;
 	}
 }
 
 void
-MidiStreamView::rec_data_range_ready (jack_nframes_t start, jack_nframes_t cnt, Source * src)
+MidiStreamView::note_range_adjustment_changed()
 {
-	// this is called from the butler thread for now
-	// yeah we need a "peak" building thread or something.  whatever. :)
-	
-	ENSURE_GUI_THREAD(bind (mem_fun (*this, &MidiStreamView::rec_data_range_ready), start, cnt, src));
-	
-	//cerr << "REC DATA: " << start << " --- " << cnt << endl;
+	double sum = note_range_adjustment.get_value() + note_range_adjustment.get_page_size();
+	int lowest = (int) floor(note_range_adjustment.get_value());
+	int highest;
 
-	if (rec_data_ready_map.size() == 0 || start+cnt > last_rec_data_frame) {
-		last_rec_data_frame = start + cnt;
+	if (sum == _range_sum_cache) {
+		//cerr << "cached" << endl;
+		highest = (int) floor(sum);
+	} else {
+		//cerr << "recalc" << endl;
+		highest = lowest + (int) floor(note_range_adjustment.get_page_size());
+		_range_sum_cache = sum;
 	}
 
-	rec_data_ready_map[src] = true;
-
-	if (rec_data_ready_map.size() == _trackview.get_diskstream()->n_channels().get(DataType::MIDI)) {
-		this->update_rec_regions ();
-		rec_data_ready_map.clear();
+	if (lowest == _lowest_note && highest == _highest_note) {
+		return;
 	}
+
+	//cerr << "note range adjustment changed: " << lowest << " " << highest << endl;
+	//cerr << "  val=" << v_zoom_adjustment.get_value() << " page=" << v_zoom_adjustment.get_page_size() << " sum=" << v_zoom_adjustment.get_value() + v_zoom_adjustment.get_page_size() << endl;
+
+	_lowest_note = lowest;
+	_highest_note = highest;
+	apply_note_range(lowest, highest, true);
 }
 
 void
-MidiStreamView::color_handler (ColorID id, uint32_t val)
+MidiStreamView::update_rec_box ()
 {
-	switch (id) {
-	case cMidiTrackBase:
-		if (_trackview.is_midi_track()) {
-			canvas_rect->property_fill_color_rgba() = val;
-		} 
-		break;
-	case cMidiBusBase:
-		if (!_trackview.is_midi_track()) {
-			canvas_rect->property_fill_color_rgba() = val;
-		}
-		break;
-	case cMidiTrackOutline:
-		canvas_rect->property_outline_color_rgba() = val;
-		break;
+	StreamView::update_rec_box ();
 
-	default:
-		break;
+	if (rec_regions.empty()) {
+		return;
 	}
+
+	/* Update the region being recorded to reflect where we currently are */
+	boost::shared_ptr<ARDOUR::Region> region = rec_regions.back().first;
+	region->set_length (_trackview.track()->current_capture_end () - _trackview.track()->current_capture_start(), this);
+
+	MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (rec_regions.back().second);
+	mrv->extend_active_notes ();
 }
+