remove AU GUI debugging test in which arrow keys could be used to change GUI size
[ardour.git] / gtk2_ardour / midi_streamview.cc
index 903197072d22798704a67729dd290ef99e2ae56a..311327f0ec74c6cb515bfc2958a6b21085fdc4a2 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001-2007 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
 
 #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/midi_events.h>
-#include <ardour/smf_source.h>
-#include <ardour/region_factory.h>
+#include "ardour/midi_region.h"
+#include "ardour/midi_source.h"
+#include "ardour/midi_track.h"
+#include "ardour/region_factory.h"
+#include "ardour/session.h"
+#include "ardour/smf_source.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 "utils.h"
+#include "selection.h"
 #include "simplerect.h"
-#include "simpleline.h"
+#include "utils.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -55,81 +55,110 @@ using namespace Editing;
 
 MidiStreamView::MidiStreamView (MidiTimeAxisView& tv)
        : StreamView (tv)
-       , _range(ContentsRange)
+       , note_range_adjustment(0.0f, 0.0f, 0.0f)
+       , _range_dirty(false)
+       , _range_sum_cache(-1.0)
        , _lowest_note(60)
-       , _highest_note(60)
+       , _highest_note(71)
+       , _data_note_min(60)
+       , _data_note_max(71)
+       , _note_lines (0)
+       , _updates_suspended (false)
 {
-       if (tv.is_track())
-               stream_base_color = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get();
-       else
-               stream_base_color = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();
-       
-       canvas_rect->property_fill_color_rgba() = stream_base_color;
-       canvas_rect->property_outline_color_rgba() = RGBA_BLACK;
-
-       use_rec_regions = tv.editor.show_waveforms_recording ();
-       
-       _note_line_group = new ArdourCanvas::Group (*canvas_group);
-       
-       for (uint8_t i=0; i < 127; ++i) {
-               _note_lines[i] = new ArdourCanvas::SimpleLine(*_note_line_group,
-                               0, note_to_y(i), 10, note_to_y(i));
-               _note_lines[i]->property_color_rgba() = 0xEEEEEE55;
-       }
+       /* 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));
+
+       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 ()
 {
 }
 
-
 RegionView*
-MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wfd)
+MidiStreamView::create_region_view (boost::shared_ptr<Region> r, bool /*wfd*/, bool)
 {
        boost::shared_ptr<MidiRegion> region = boost::dynamic_pointer_cast<MidiRegion> (r);
 
        if (region == 0) {
-               return NULL;
+               return 0;
        }
 
-       MidiRegionView *region_view;
-       list<RegionView *>::iterator i;
+       RegionView* region_view = new MidiRegionView (_canvas_group, _trackview, region,
+                                                     _samples_per_unit, region_color);
 
-       for (i = region_views.begin(); i != region_views.end(); ++i) {
+       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 0;
+       }
+
+       for (list<RegionView*>::iterator 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);
-                       (*i)->enable_display(wfd);
+
                        display_region(dynamic_cast<MidiRegionView*>(*i), wfd);
 
-                       return NULL;
+                       return 0;
                }
        }
-       
-       region_view = new MidiRegionView (canvas_group, _trackview, region, 
-                       _samples_per_unit, region_color);
-               
-       region_view->init (region_color, false);
+
+       MidiRegionView* region_view = dynamic_cast<MidiRegionView*> (create_region_view (r, wfd, recording));
+       if (region_view == 0) {
+               return 0;
+       }
+
        region_views.push_front (region_view);
-       
-       /* follow global waveform setting */
 
-       if (wfd) {
-               region_view->enable_display(true);
-               region_view->midi_region()->midi_source(0)->load_model();
+       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);
-
-       /* always display at least 1 octave range */
-       _highest_note = max(_highest_note, static_cast<uint8_t>(_lowest_note + 11));
+       display_region (region_view, wfd);
 
        /* catch regionview going away */
-       region->GoingAway.connect (bind (mem_fun (*this, &MidiStreamView::remove_region_view), region));
-       
+       region->DropReferences.connect (*this, invalidator (*this), boost::bind (&MidiStreamView::remove_region_view, this, region), gui_context());
+
        RegionViewAdded (region_view);
 
        return region_view;
@@ -138,231 +167,352 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wfd)
 void
 MidiStreamView::display_region(MidiRegionView* region_view, bool load_model)
 {
-       if ( ! region_view)
+       if (!region_view) {
                return;
+       }
+
+       region_view->enable_display(true);
 
        boost::shared_ptr<MidiSource> source(region_view->midi_region()->midi_source(0));
 
-       if (load_model)
+       if (load_model) {
                source->load_model();
-
-       if (source->model()) {
-               // Find our note range
-               for (size_t i=0; i < source->model()->n_notes(); ++i) {
-                       const Note& note = source->model()->note_at(i);
-                       update_bounds(note.note());
-               }
        }
-       
+
+       _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_diskstream (boost::shared_ptr<Diskstream> ds)
+MidiStreamView::display_track (boost::shared_ptr<Track> tr)
 {
-       StreamView::display_diskstream(ds);
-       draw_note_separators();
+       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)
 {
-       list<RegionView *>::iterator i, tmp;
-
-       for (i = region_views.begin(); i != region_views.end(); ++i) {
-               (*i)->enable_display(true); // FIXME: double display, remove
-               (*i)->set_valid (false);
-               
-               /* FIXME: slow.  MidiRegionView needs a find_note_range method
-                * that finds the range without wasting time drawing the events */
-
-               // Load model if it isn't already, to get note range
-               MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
-               mrv->midi_region()->midi_source(0)->load_model();
+       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());
        }
-       
-       //_lowest_note = 60; // middle C
-       //_highest_note = _lowest_note + 11;
+}
 
-       if (_trackview.is_midi_track()) {
-               _trackview.get_diskstream()->playlist()->foreach_region (static_cast<StreamView*>(this), &StreamView::add_region_view);
+bool
+MidiStreamView::update_data_note_range(uint8_t min, uint8_t max)
+{
+       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;
+}
 
-       /* 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;
+void
+MidiStreamView::redisplay_track ()
+{
+       if (!_trackview.is_midi_track()) {
+               return;
        }
-       
-       for (i = region_views.begin(); i != region_views.end(); ) {
-               tmp = i;
-               tmp++;
-
-               if (!(*i)->is_valid()) {
-                       delete *i;
-                       region_views.erase (i);
-               } else {
-                       (*i)->enable_display(true);
-                       (*i)->set_y_position_and_height(0, height); // apply note range
-               }
 
-               i = tmp;
+       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;
        }
-       
-       /* now fix layering */
 
-       for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-               region_layered (*i);
+       // Flag region views as invalid and disable drawing
+       for (i = region_views.begin(); i != region_views.end(); ++i) {
+               (*i)->set_valid(false);
+               (*i)->enable_display(false);
        }
-       
-       draw_note_separators();
+
+       // 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_y_position_and_height ()
+MidiStreamView::update_contents_height ()
 {
-       StreamView::update_contents_y_position_and_height();
-       draw_note_separators();
+       StreamView::update_contents_height();
+       _note_lines->property_y2() = child_height ();
+
+       apply_note_range (lowest_note(), highest_note(), true);
 }
-       
+
 void
-MidiStreamView::draw_note_separators()
+MidiStreamView::draw_note_lines()
 {
-       for (uint8_t i=0; i < 127; ++i) {
-               if (i >= _lowest_note-1 && i <= _highest_note) {
-                       _note_lines[i]->property_x1() = 0;
-                       _note_lines[i]->property_x2() = canvas_rect->property_x2() - 2;
-                       _note_lines[i]->property_y1() = note_to_y(i);
-                       _note_lines[i]->property_y2() = note_to_y(i);
-                       _note_lines[i]->show();
+       if (!_note_lines || _updates_suspended) {
+               return;
+       }
+
+       double y;
+       double prev_y = contents_height();
+       uint32_t color;
+
+       _note_lines->clear();
+
+       if (child_height() < 140 || note_height() < 3) {
+               /* track is too small for note lines, or there are too many */
+               return;
+       }
+
+       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[i]->hide();
+                       _note_lines->add_line(y + 1.0, prev_y - y - 1.0, color);
                }
+
+               prev_y = y;
        }
 }
-       
 
 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;
+               _lowest_note = _data_note_min;
+               _highest_note = _data_note_max;
        }
-       redisplay_diskstream();
+
+       apply_note_range(_lowest_note, _highest_note, true);
 }
 
-       
-void 
-MidiStreamView::update_bounds(uint8_t note_num)
+void
+MidiStreamView::apply_note_range(uint8_t lowest, uint8_t highest, bool to_region_views)
 {
-       _lowest_note = min(_lowest_note, note_num);
-       _highest_note = max(_highest_note, note_num);
+       _highest_note = highest;
+       _lowest_note = lowest;
+
+       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 > 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++;
+                       }
+                       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();
+
+       if (to_region_views) {
+               apply_note_range_to_regions ();
+       }
+
+       NoteRangeChanged();
 }
 
+void
+MidiStreamView::apply_note_range_to_regions ()
+{
+       if (!_updates_suspended) {
+               for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
+                       ((MidiRegionView*)(*i))->apply_note_range(_lowest_note, _highest_note);
+               }
+       }
+}
+
+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()) {
+       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;
-                               
-                               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();
 
-                               // FIXME
-                               boost::shared_ptr<MidiDiskstream> mds = boost::dynamic_pointer_cast<MidiDiskstream>(_trackview.get_diskstream());
-                               assert(mds);
+                               rec_data_ready_connections.drop_connections ();
 
-                               sources.push_back(mds->write_source());
-                               
-                               rec_data_ready_connections.push_back (mds->write_source()->ViewDataRangeReady.connect (bind (mem_fun (*this, &MidiStreamView::rec_data_range_ready), boost::weak_ptr<Source>(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().first->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 ();
                                }
-                               
+
+                               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
+                                  is so that the RegionView gets created with a non-zero width, as apparently
+                                  creating a RegionView with a zero width causes it never to be displayed
+                                  (there is a warning in TimeAxisViewItem::init about this).  However, we
+                                  must also set length_beats to something non-zero, otherwise the frame length
+                                  of 1 causes length_beats to be set to some small quantity << 1.  Then
+                                  when the position is set up below, this length_beats is used to recompute
+                                  length using BeatsFramesConverter::to, which is slightly innacurate for small
+                                  beats values because it converts floating point beats to bars, beats and
+                                  integer ticks.  The upshot of which being that length gets set back to 0,
+                                  meaning no region view is ever seen, meaning no MIDI notes during record (#3820).
+                               */
+                               plist.add (ARDOUR::Properties::length_beats, 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, start, 1 , "", 0, (Region::Flag)(Region::DefaultFlags | Region::DoNotSaveState), false)));
+                                                                     (RegionFactory::create (sources, plist, false)));
+
                                assert(region);
-                               region->set_position (_trackview.session().transport_frame(), this);
-                               rec_regions.push_back (make_pair(region, (RegionView*)0));
-                               
+                               region->set_start (_trackview.track()->current_capture_start() - _trackview.track()->get_capture_start_frame (0));
+                               region->set_position (_trackview.track()->current_capture_start());
+                               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 */
 
                        boost::shared_ptr<MidiTrack> mt = _trackview.midi_track(); /* we know what it is already */
-                       boost::shared_ptr<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;
+                       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 = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
-                       
-                       ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*canvas_group);
+
+                       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_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;
 
                } else if (rec_active &&
-                          (_trackview.session().record_status() != Session::Recording ||
-                           !_trackview.get_diskstream()->record_enabled())) {
-
+                          (_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;
@@ -371,20 +521,16 @@ MidiStreamView::setup_rec_box ()
 
                        /* 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;
-                       
+
                        /* remove temp regions */
-                       
+
                        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;
 
@@ -392,7 +538,7 @@ MidiStreamView::setup_rec_box ()
 
                                iter = tmp;
                        }
-                       
+
                        rec_regions.clear();
 
                        // cerr << "\tclear " << rec_rects.size() << " rec rects\n";
@@ -402,151 +548,113 @@ MidiStreamView::setup_rec_box ()
                                RecBoxInfo &rect = (*iter);
                                delete rect.rectangle;
                        }
-                       
+
                        rec_rects.clear();
-                       
+
                }
        }
 }
 
 void
-MidiStreamView::update_rec_regions (boost::shared_ptr<MidiModel> data, nframes_t start, nframes_t dur)
+MidiStreamView::color_handler ()
 {
-       ENSURE_GUI_THREAD (bind (mem_fun (*this, &MidiStreamView::update_rec_regions), data, start, dur));
-
-       if (use_rec_regions) {
-
-               uint32_t n = 0;
-
-               for (list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) {
+       draw_note_lines ();
 
-                       list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator tmp;
-
-                       tmp = iter;
-                       ++tmp;
-
-                       if (!canvas_item_visible (rec_rects[n].rectangle)) {
-                               /* rect already hidden, this region is done */
-                               iter = tmp;
-                               continue;
-                       }
-                       
-                       boost::shared_ptr<MidiRegion> region = boost::dynamic_pointer_cast<MidiRegion>(iter->first);
-                       if (!region) {
-                               continue;
-                       }
-
-                       nframes_t origlen = region->length();
-                       
-                       //cerr << "MIDI URR: " << start << " * " << dur
-                       //      << " (origlen " << origlen << ")" << endl;
-
-                       if (region == rec_regions.back().first && rec_active) {
-
-                               if (start >= region->start()) {
-
-                                       nframes_t nlen = start + dur - 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");
-
-                                               if (origlen == 1) {
-                                                       /* our special initial length */
-                                                       iter->second = add_region_view_internal (region, false);
-                                                       ((MidiRegionView*)iter->second)->begin_write();
-                                               }
-
-                                               /* 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;
-
-                                               /* draw events */
-                                               MidiRegionView* mrv = (MidiRegionView*)iter->second;
-                                               // FIXME: slow
-                                               for (size_t i=0; i < data->n_notes(); ++i) {
-                                                       const Note& note = data->note_at(i);
-                                                       if (note.time() > start + dur)
-                                                               break;
+       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();;
+       }
+}
 
-                                                       if (note.time() >= start)
-                                                               if (data->note_mode() == Percussive || note.duration() > 0)
-                                                                       mrv->add_note(note);
-                                                               else
-                                                                       mrv->add_event(note.on_event());
+void
+MidiStreamView::note_range_adjustment_changed()
+{
+       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 (note.duration() > 0 && note.end_time() >= start)
-                                                               mrv->add_event(note.off_event());
+       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;
+       }
 
-                                               }
-                                               
-                                               mrv->extend_active_notes();
+       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;
 
-                       } else {
+       _lowest_note = lowest;
+       _highest_note = highest;
+       apply_note_range(lowest, highest, true);
+}
 
-                               nframes_t nlen = _trackview.get_diskstream()->get_captured_frames(n);
+void
+MidiStreamView::update_rec_box ()
+{
+       StreamView::update_rec_box ();
 
-                               if (nlen != region->length()) {
+       if (rec_regions.empty()) {
+               return;
+       }
 
-                                       if (region->source(0)->length() >= region->start() + nlen) {
+       /* 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());
 
-                                               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 */
-                                                       iter->second = add_region_view_internal (region, false);
-                                               }
-                                               
-                                               /* also hide rect */
-                                               ArdourCanvas::Item * rect = rec_rects[n].rectangle;
-                                               rect->hide();
+       MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (rec_regions.back().second);
+       mrv->extend_active_notes ();
+}
 
-                                       }
-                               }
-                       }
+uint8_t
+MidiStreamView::y_to_note (double y) const
+{
+       int const n = ((contents_height() - y - 1) / contents_height() * (double)contents_note_range())
+               + lowest_note();
 
-                       iter = tmp;
-               }
+       if (n < 0) {
+               return 0;
+       } else if (n > 127) {
+               return 127;
        }
+
+       return n;
 }
 
+/** Suspend updates to the regions' note ranges and our
+ *  note lines until resume_updates() is called.
+ */
 void
-MidiStreamView::rec_data_range_ready (jack_nframes_t start, jack_nframes_t dur, boost::weak_ptr<Source> weak_src)
+MidiStreamView::suspend_updates ()
 {
-       // this is called from the butler thread for now
-       
-       ENSURE_GUI_THREAD(bind (mem_fun (*this, &MidiStreamView::rec_data_range_ready), start, dur, weak_src));
-       
-       boost::shared_ptr<SMFSource> src (boost::dynamic_pointer_cast<SMFSource>(weak_src.lock()));
-       
-       //cerr << src.get() << " MIDI READY: " << start << " * " << dur
-       //      << " -- " << data->size() << " events!" << endl;
-       
-       this->update_rec_regions (src->model(), start, dur);
+       _updates_suspended = true;
 }
 
+/** Resume updates to region note ranges and note lines,
+ *  and update them now.
+ */
 void
-MidiStreamView::color_handler ()
+MidiStreamView::resume_updates ()
 {
+       _updates_suspended = false;
 
-       //case cMidiTrackBase:
-       if (_trackview.is_midi_track()) {
-               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get();
-       } 
+       draw_note_lines ();
+       apply_note_range_to_regions ();
+}
 
-       //case cMidiBusBase:
-       if (!_trackview.is_midi_track()) {
-               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();;
+void
+MidiStreamView::leave_internal_edit_mode ()
+{
+       StreamView::leave_internal_edit_mode ();
+       for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
+               MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (*i);
+               assert (mrv);
+               mrv->clear_selection ();
        }
 }
-