Fix insane formatting (how did this even happen? copy paste from an email diff or...
[ardour.git] / gtk2_ardour / midi_streamview.cc
index 9be0c8dfdd886ff128d438bf1422aab27d6c9ba6..5bb232bdedf116d8b39e70a5daf966a2cd5a5137 100644 (file)
@@ -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
 
 #include <cmath>
 #include <cassert>
+#include <utility>
 
 #include <gtkmm.h>
 
 #include <gtkmm2ext/gtk_ui.h>
 
+#include <ardour/midi_diskstream.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/source.h>
+#include <ardour/region_factory.h>
+#include <ardour/smf_source.h>
 
+#include "ardour_ui.h"
+#include "canvas-simplerect.h"
+#include "gui_thread.h"
+#include "lineset.h"
+#include "midi_region_view.h"
 #include "midi_streamview.h"
-#include "regionview.h"
-//#include "midi_regionview.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)
 {
-       region_color = _trackview.color();
-
-       if (tv.is_midi_track())
-               stream_base_color = color_map[cMidiTrackBase];
-       else
-               stream_base_color = color_map[cMidiBusBase];
-
-       /* set_position() will position the group */
+       if (tv.is_track()) {
+               stream_base_color = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get();
+       } else {
+               stream_base_color = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();
+       }
 
-       canvas_group = new ArdourCanvas::Group(*_trackview.canvas_display);
+       use_rec_regions = tv.editor().show_waveforms_recording ();
 
-       canvas_rect = new ArdourCanvas::SimpleRect (*canvas_group);
-       canvas_rect->property_x1() = 0.0;
-       canvas_rect->property_y1() = 0.0;
-       canvas_rect->property_x2() = 1000000.0;
-       canvas_rect->property_y2() = (double) tv.height;
-       canvas_rect->property_outline_color_rgba() = color_map[cMidiTrackOutline];
-       canvas_rect->property_outline_what() = (guint32) (0x1|0x2|0x8);  // outline ends and bottom 
-       canvas_rect->property_fill_color_rgba() = stream_base_color;
+       /* 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();
 
-       canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_stream_view_event), canvas_rect, &_trackview));
+       /* 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);
 
-       _samples_per_unit = _trackview.editor.get_current_zoom();
+       _note_lines->property_x1() = 0;
+       _note_lines->property_y1() = 0;
+       _note_lines->property_x2() = trackview().editor().frame_to_pixel (max_frames);
+       _note_lines->property_y2() = 0;
 
-       if (_trackview.is_midi_track()) {
-               _trackview.midi_track()->DiskstreamChanged.connect (mem_fun (*this, &MidiStreamView::diskstream_changed));
-               _trackview.session().TransportStateChange.connect (mem_fun (*this, &MidiStreamView::transport_changed));
-               _trackview.get_diskstream()->RecordEnableChanged.connect (mem_fun (*this, &MidiStreamView::rec_enable_changed));
-               _trackview.session().RecordStateChanged.connect (mem_fun (*this, &MidiStreamView::sess_rec_enable_changed));
-       } 
+       _note_lines->signal_event().connect(bind(
+                       mem_fun(_trackview.editor(), &PublicEditor::canvas_stream_view_event),
+                       _note_lines, &_trackview));
 
-       rec_updating = false;
-       rec_active = false;
-       use_rec_regions = tv.editor.show_waveforms_recording ();
+       _note_lines->lower_to_bottom();
 
-       ColorChanged.connect (mem_fun (*this, &MidiStreamView::color_handler));
+       ColorsChanged.connect(mem_fun(*this, &MidiStreamView::draw_note_lines));
+       
+       note_range_adjustment.set_page_size(_highest_note - _lowest_note);
+       note_range_adjustment.set_value(_lowest_note);
+       
+       note_range_adjustment.signal_value_changed().connect(
+                       mem_fun(*this, &MidiStreamView::note_range_adjustment_changed));
 }
 
 MidiStreamView::~MidiStreamView ()
 {
-       undisplay_diskstream ();
-       delete canvas_group;
 }
 
-
-void
-MidiStreamView::add_region_view_internal (Region *r, bool wait_for_waves)
+static void
+veto_note_range(uint8_t& min, uint8_t& max)
 {
-#if 0
-       ENSURE_GUI_THREAD (bind (mem_fun (*this, &MidiStreamView::add_region_view), r));
+       /* 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);
+}
 
-       MidiRegion* region = dynamic_cast<MidiRegion*> (r);
+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 NULL;
        }
 
        MidiRegionView *region_view;
        list<RegionView *>::iterator i;
 
        for (i = region_views.begin(); i != region_views.end(); ++i) {
-               if (&(*i)->region() == r) {
+               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 NULL;
                }
        }
        
-       /* FIXME 
-       switch (_trackview.midi_track()->mode()) {
-       case Normal:
-               region_view = new MidiRegionView (canvas_group, _trackview, *region, 
-                                                  _samples_per_unit, region_color);
-               break;
-       case Destructive:
-               region_view = new TapeMidiRegionView (canvas_group, _trackview, *region, 
-                                                      _samples_per_unit, region_color);
-               break;
-       }
-       */
-       region_view = new MidiRegionView (canvas_group, _trackview, *region, 
-                                          _samples_per_unit, region_color);
-
-       region_view->init (region_color, wait_for_waves);
+       region_view = new MidiRegionView (canvas_group, _trackview, region, 
+                       _samples_per_unit, region_color);
+               
+       region_view->init (region_color, false);
        region_views.push_front (region_view);
-       
-       /* catch regionview going away */
+                       
+       /* display events and find note range */
+       display_region(region_view, wfd);
 
-       region->GoingAway.connect (mem_fun (*this, &MidiStreamView::remove_region_view));
+       /* catch regionview going away */
+       region->GoingAway.connect (bind (mem_fun (*this, &MidiStreamView::remove_region_view), region));
        
        RegionViewAdded (region_view);
-#endif
+
+       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(height);
+       region_view->display_model(source->model());
+}
+
+void
+MidiStreamView::display_diskstream (boost::shared_ptr<Diskstream> ds)
+{
+       StreamView::display_diskstream(ds);
+       draw_note_lines();
+       NoteRangeChanged();
+}
+                       
+void
+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)
+{
+       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;
 }
 
-// FIXME: code duplication with AudioStreamVIew
 void
 MidiStreamView::redisplay_diskstream ()
 {
-       list<RegionView *>::iterator i, tmp;
+       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.get_diskstream()->playlist()->foreach_region(
+                       static_cast<StreamView*>(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.get_diskstream()->playlist()->foreach_region(
+                       static_cast<StreamView*>(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() = height;
+       draw_note_lines();
+}
+       
+void
+MidiStreamView::draw_note_lines()
+{
+       double y;
+       double prev_y = contents_height();
+       uint32_t color;
+
+       _note_lines->clear();
 
-       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)->is_valid()) {
-                       delete *i;
-                       region_views.erase (i);
-               } 
+               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);
+               }
 
-               i = tmp;
+               prev_y = y;
        }
+}
 
-       /* now fix layering */
+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;
+       }
 
-       playlist_modified ();
+       apply_note_range(_lowest_note, _highest_note, true);
 }
 
+void
+MidiStreamView::apply_note_range(uint8_t lowest, uint8_t highest, bool to_region_views)
+{
+       _highest_note = highest;
+       _lowest_note = lowest;
+       note_range_adjustment.set_page_size(_highest_note - _lowest_note);
+       note_range_adjustment.set_value(_lowest_note);
+       draw_note_lines();
+       
+       if (to_region_views) {
+               for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
+                       ((MidiRegionView*)(*i))->apply_note_range(lowest, highest);
+               }
+       }
+
+       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 ()
 {
-#if 0
        // cerr << _trackview.name() << " streamview SRB\n";
 
        if (_trackview.session().transport_rolling()) {
 
-               // cerr << "\trolling\n";
-
                if (!rec_active && 
                    _trackview.session().record_status() == Session::Recording && 
                    _trackview.get_diskstream()->record_enabled()) {
 
-                       if (_trackview.midi_track()->mode() == Normal && use_rec_regions && rec_regions.size() == rec_rects.size()) {
+                       if (use_rec_regions && rec_regions.size() == rec_rects.size()) {
 
                                /* add a new region, but don't bother if they set use_rec_regions 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
-                               MidiDiskstream* ads = dynamic_cast<MidiDiskstream*>(_trackview.get_diskstream());
-                               assert(ads);
+                               boost::shared_ptr<MidiDiskstream> mds = boost::dynamic_pointer_cast<MidiDiskstream>(_trackview.get_diskstream());
+                               assert(mds);
+
+                               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())))); 
 
                                // handle multi
                                
                                jack_nframes_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->position() + _trackview.get_diskstream()->get_captured_frames(rec_regions.size()-1);
                                }
                                
-                               MidiRegion * region = new MidiRegion(sources, start, 1 , "", 0, (Region::Flag)(Region::DefaultFlags | Region::DoNotSaveState), false);
+                               boost::shared_ptr<MidiRegion> region (boost::dynamic_pointer_cast<MidiRegion>
+                                       (RegionFactory::create (sources, start, 1 , "", 0, (Region::Flag)(Region::DefaultFlags | Region::DoNotSaveState), false)));
+                               assert(region);
                                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));
+                               rec_regions.push_back (make_pair(region, (RegionView*)0));
+                               
+                               // rec regions are destroyed in setup_rec_box
 
                                /* we add the region later */
                        }
                        
                        /* start a new rec box */
 
-                       MidiTrack* at;
-
-                       at = _trackview.midi_track(); /* we know what it is already */
-                       MidiDiskstream& ds = at->midi_diskstream();
-                       jack_nframes_t frame_pos = ds.current_capture_start ();
-                       gdouble xstart = _trackview.editor.frame_to_pixel (frame_pos);
+                       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;
                        uint32_t fill_color;
 
-                       switch (_trackview.midi_track()->mode()) {
-                       case Normal:
-                               xend = xstart;
-                               fill_color = color_map[cRecordingRectFill];
-                               break;
-
-                       case Destructive:
-                               xend = xstart + 2;
-                               fill_color = color_map[cRecordingRectFill];
-                               /* make the recording rect translucent to allow
-                                  the user to see the peak data coming in, etc.
-                               */
-                               fill_color = UINT_RGBA_CHANGE_A (fill_color, 120);
-                               break;
-                       }
+                       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);
                        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;
@@ -286,25 +464,23 @@ MidiStreamView::setup_rec_box ()
                        /* disconnect rapid update */
                        screen_update_connection.disconnect();
 
-                       for (list<sigc::connection>::iterator prc = peak_ready_connections.begin(); prc != peak_ready_connections.end(); ++prc) {
+                       for (list<sigc::connection>::iterator prc = rec_data_ready_connections.begin(); prc != rec_data_ready_connections.end(); ++prc) {
                                (*prc).disconnect();
                        }
-                       peak_ready_connections.clear();
+                       rec_data_ready_connections.clear();
 
                        rec_updating = false;
                        rec_active = false;
-                       last_rec_peak_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;
                        }
@@ -312,7 +488,6 @@ MidiStreamView::setup_rec_box ()
                        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) {
@@ -324,68 +499,102 @@ MidiStreamView::setup_rec_box ()
                        
                }
        }
-#endif
 }
 
 void
-MidiStreamView::update_rec_regions ()
+MidiStreamView::update_rec_regions (boost::shared_ptr<MidiModel> data, nframes_t start, nframes_t dur)
 {
-#if 0
+       ENSURE_GUI_THREAD (bind (mem_fun (*this, &MidiStreamView::update_rec_regions), data, start, dur));
+
        if (use_rec_regions) {
 
                uint32_t n = 0;
+               bool     update_range = false;
 
-               for (list<Region*>::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) {
+               for (list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) {
 
-                       list<Region*>::iterator tmp;
+                       list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator tmp;
 
                        tmp = iter;
                        ++tmp;
-
+                       
+                       boost::shared_ptr<MidiRegion> region = boost::dynamic_pointer_cast<MidiRegion>(iter->first);
+                       if (!region || !iter->second) {
+                               iter = tmp;
+                               continue;
+                       }
+                       
                        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_peak_frame > region->start()) {
+                       nframes_t origlen = region->length();
+                       
+                       if (region == rec_regions.back().first && rec_active) {
 
-                                       jack_nframes_t nlen = last_rec_peak_frame - region->start();
+                               if (start >= region->midi_source(0)->timeline_position()) {
+                               
+                                       nframes_t nlen = start + dur - region->position();
 
                                        if (nlen != region->length()) {
-
+                                       
                                                region->freeze ();
                                                region->set_position (_trackview.get_diskstream()->get_capture_start_frame(n), this);
-                                               region->set_length (nlen, this);
+                                               region->set_length (start + dur - region->position(), this);
                                                region->thaw ("updated");
-
+                                               
                                                if (origlen == 1) {
                                                        /* our special initial length */
-                                                       add_region_view_internal (region, false);
+                                                       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());
+                                               gdouble xend = _trackview.editor().frame_to_pixel (region->position() + region->length());
                                                rect->property_x2() = xend;
+
+                                               /* draw events */
+                                               MidiRegionView* mrv = (MidiRegionView*)iter->second;
+                                               for (size_t i=0; i < data->n_notes(); ++i) {
+
+                                                       // FIXME: slooooooooow!
+
+                                                       const boost::shared_ptr<MidiRegionView::NoteType> note = data->note_at(i);
+                                                       
+                                                       if (note->length() > 0 && note->end_time() + region->position() > start)
+                                                               mrv->resolve_note(note->note(), note->end_time());
+
+                                                       if (note->time() + region->position() < start)
+                                                               continue;
+
+                                                       if (note->time() + region->position() > start + dur)
+                                                               break;
+
+                                                       mrv->add_note(note);
+
+                                                       if (note->note() < _lowest_note) {
+                                                               _lowest_note = note->note();
+                                                               update_range = true;
+                                                       } else if (note->note() > _highest_note) {
+                                                               _highest_note = note->note();
+                                                               update_range = true;
+                                                       }
+                                               }
+                                               
+                                               mrv->extend_active_notes();
                                        }
                                }
 
                        } else {
-
-                               jack_nframes_t nlen = _trackview.get_diskstream()->get_captured_frames(n);
+                               
+                               nframes_t nlen = _trackview.get_diskstream()->get_captured_frames(n);
 
                                if (nlen != region->length()) {
 
-                                       if (region->source(0).length() >= region->start() + nlen) {
+                                       if (region->source(0)->length() >= region->position() + nlen) {
 
                                                region->freeze ();
                                                region->set_position (_trackview.get_diskstream()->get_capture_start_frame(n), this);
@@ -394,7 +603,7 @@ MidiStreamView::update_rec_regions ()
                                                
                                                if (origlen == 1) {
                                                        /* our special initial length */
-                                                       add_region_view_internal (region, false);
+                                                       iter->second = add_region_view_internal (region, false);
                                                }
                                                
                                                /* also hide rect */
@@ -407,29 +616,63 @@ MidiStreamView::update_rec_regions ()
 
                        iter = tmp;
                }
+
+               if (update_range)
+                       update_contents_height();
        }
-#endif
 }
 
 void
-MidiStreamView::color_handler (ColorID id, uint32_t val)
+MidiStreamView::rec_data_range_ready (jack_nframes_t start, jack_nframes_t dur, boost::weak_ptr<Source> weak_src)
 {
-       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;
+       // 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()));
+       
+       this->update_rec_regions (src->model(), start, dur);
+}
 
-       default:
-               break;
+void
+MidiStreamView::color_handler ()
+{
+       //case cMidiTrackBase:
+       if (_trackview.is_midi_track()) {
+               //canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get();
+       } 
+
+       //case cMidiBusBase:
+       if (!_trackview.is_midi_track()) {
+               //canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();;
        }
 }
+
+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 (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;
+       }
+
+       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);
+}
+