X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_streamview.cc;h=0d50c8910f2275400aa503954573e209953a502f;hb=8e59a26ccf13de93ac681d761bad09cd6bcf0c90;hp=5b162dc510c5a4e309659376a4e18b7762b07716;hpb=68e943265edf04e63a8e8b8f62bab20f99d9c637;p=ardour.git diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index 5b162dc510..0d50c8910f 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -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 @@ -24,28 +24,30 @@ #include -#include -#include -#include -#include -#include -#include -#include +#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 "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 "lineset.h" +#include "utils.h" using namespace std; using namespace ARDOUR; @@ -55,90 +57,131 @@ using namespace Editing; MidiStreamView::MidiStreamView (MidiTimeAxisView& tv) : StreamView (tv) , note_range_adjustment(0.0f, 0.0f, 0.0f) - , _range(ContentsRange) + , _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) { - if (tv.is_track()) + if (tv.is_track()) { stream_base_color = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get(); - else + } else { stream_base_color = ARDOUR_UI::config()->canvasvar_MidiBusBase.get(); + } - use_rec_regions = tv.editor.show_waveforms_recording (); + use_rec_regions = tv.editor().show_waveforms_recording (); /* 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 + /* put the note lines in the timeaxisview's group, so it can be put below ghost regions from MIDI underlays*/ - _note_lines = new ArdourCanvas::Lineset(*canvas_group, ArdourCanvas::Lineset::Horizontal); + _note_lines = new ArdourCanvas::LineSet(*canvas_group, ArdourCanvas::LineSet::Horizontal); _note_lines->property_x1() = 0; _note_lines->property_y1() = 0; - _note_lines->property_x2() = trackview().editor.frame_to_pixel (max_frames); + _note_lines->property_x2() = trackview().editor().frame_to_pixel (max_frames); _note_lines->property_y2() = 0; - _note_lines->signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_stream_view_event), _note_lines, &_trackview)); + _note_lines->signal_event().connect(sigc::bind( + sigc::mem_fun(_trackview.editor(), &PublicEditor::canvas_stream_view_event), + _note_lines, &_trackview)); + _note_lines->lower_to_bottom(); - note_range_adjustment.signal_value_changed().connect (mem_fun (*this, &MidiStreamView::note_range_adjustment_changed)); - ColorsChanged.connect(mem_fun(*this, &MidiStreamView::draw_note_lines)); + ColorsChanged.connect(sigc::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( + 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); +} RegionView* -MidiStreamView::add_region_view_internal (boost::shared_ptr r, bool wfd, bool recording) +MidiStreamView::create_region_view (boost::shared_ptr r, bool /*wfd*/, bool) { boost::shared_ptr region = boost::dynamic_pointer_cast (r); if (region == 0) { - return NULL; + return 0; } - MidiRegionView *region_view; - list::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 r, bool wfd, bool recording) +{ + boost::shared_ptr region = boost::dynamic_pointer_cast (r); + + if (region == 0) { + return 0; + } + + for (list::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(*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); - 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(); + MidiRegionView* region_view = dynamic_cast (create_region_view (r, wfd, recording)); + if (region_view == 0) { + return 0; } - /* display events and find note range */ - display_region(region_view, wfd); + region_views.push_front (region_view); - /* always display at least 1 octave range */ - _highest_note = max(_highest_note, static_cast(_lowest_note + 11)); + /* display events and find note range */ + display_region (region_view, wfd); /* catch regionview going away */ - region->GoingAway.connect (bind (mem_fun (*this, &MidiStreamView::remove_region_view), region)); - + region->GoingAway.connect (*this, boost::bind (&MidiStreamView::remove_region_view, this, region), gui_context()); + RegionViewAdded (region_view); return region_view; @@ -150,17 +193,20 @@ MidiStreamView::display_region(MidiRegionView* region_view, bool load_model) if ( ! region_view) return; + region_view->enable_display(true); + boost::shared_ptr source(region_view->midi_region()->midi_source(0)); - if (load_model) + if (load_model) { source->load_model(); + } + + _range_dirty = update_data_note_range( + source->model()->lowest_note(), + source->model()->highest_note()); - // Find our note range - if (source->model()) - for (size_t i=0; i < source->model()->n_notes(); ++i) - update_bounds(source->model()->note_at(i)->note()); - // Display region contents + region_view->set_height(height); region_view->display_model(source->model()); } @@ -172,75 +218,89 @@ MidiStreamView::display_diskstream (boost::shared_ptr ds) NoteRangeChanged(); } -// FIXME: code duplication with AudioStreamView void -MidiStreamView::redisplay_diskstream () +MidiStreamView::update_contents_metrics(boost::shared_ptr r) { - list::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(*i); - mrv->midi_region()->midi_source(0)->load_model(); + boost::shared_ptr mr = boost::dynamic_pointer_cast(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(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_diskstream () +{ + 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::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( + 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); + // 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)->enable_display(false); } - - note_range_adjustment.set_page_size(_highest_note - _lowest_note); - note_range_adjustment.set_value(_lowest_note); - NoteRangeChanged(); - draw_note_lines(); + + // Add and display region views, and flag them as valid + _trackview.get_diskstream()->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(); + StreamView::update_contents_height(); _note_lines->property_y2() = height; draw_note_lines(); } - + void MidiStreamView::draw_note_lines() { @@ -250,12 +310,12 @@ MidiStreamView::draw_note_lines() _note_lines->clear(); - for(int i = _lowest_note; i <= _highest_note; ++i) { + 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) { + switch (i % 12) { case 1: case 3: case 6: @@ -268,65 +328,65 @@ MidiStreamView::draw_note_lines() break; } - if(i == _highest_note) { + if (i == highest_note()) { _note_lines->add_line(y, prev_y - y, color); - } - else { + } else { _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::set_note_range(uint8_t lowest, uint8_t highest) { - if(_range == ContentsRange) { - _lowest_note = lowest; - _highest_note = highest; - - list::iterator i; - for (i = region_views.begin(); i != region_views.end(); ++i) { - (*i)->set_y_position_and_height(0, height); // apply note range +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::iterator i = region_views.begin(); i != region_views.end(); ++i) { + ((MidiRegionView*)(*i))->apply_note_range(lowest, highest); } } - draw_note_lines(); NoteRangeChanged(); } - -void -MidiStreamView::update_bounds(uint8_t note_num) + +void +MidiStreamView::update_note_range(uint8_t note_num) { - _lowest_note = min(_lowest_note, note_num); - _highest_note = max(_highest_note, 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 && + if (!rec_active && + _trackview.session()->record_status() == Session::Recording && _trackview.get_diskstream()->record_enabled()) { if (use_rec_regions && rec_regions.size() == rec_rects.size()) { @@ -334,52 +394,53 @@ MidiStreamView::setup_rec_box () /* add a new region, but don't bother if they set use_rec_regions mid-record */ MidiRegion::SourceList sources; - - for (list::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 mds = boost::dynamic_pointer_cast(_trackview.get_diskstream()); - assert(mds); + rec_data_ready_connections.drop_connections (); + + boost::shared_ptr mds = _trackview.midi_track()->midi_diskstream(); 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(mds->write_source())))); + + mds->write_source()->ViewDataRangeReady.connect + (rec_data_ready_connections, + ui_bind (&MidiStreamView::rec_data_range_ready, this, _1, _2, boost::weak_ptr(mds->write_source())), + gui_context()); // handle multi - - jack_nframes_t start = 0; + + nframes_t start = 0; if (rec_regions.size() > 0) { - start = rec_regions.back().first->position() + _trackview.get_diskstream()->get_captured_frames(rec_regions.size()-1); + start = rec_regions.back().first->start() + + _trackview.get_diskstream()->get_captured_frames(rec_regions.size()-1); } - + boost::shared_ptr region (boost::dynamic_pointer_cast - (RegionFactory::create (sources, start, 1 , "", 0, (Region::Flag)(Region::DefaultFlags | Region::DoNotSaveState), false))); + (RegionFactory::create (sources, start, 1 , "", 0, Region::DefaultFlags, false))); + assert(region); - region->set_position (_trackview.session().transport_frame(), this); + region->block_property_changes (); + region->set_position (_trackview.session()->transport_frame(), this); 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 */ boost::shared_ptr mt = _trackview.midi_track(); /* we know what it is already */ boost::shared_ptr ds = mt->midi_diskstream(); - jack_nframes_t frame_pos = ds->current_capture_start (); - gdouble xstart = _trackview.editor.frame_to_pixel (frame_pos); + nframes_t frame_pos = ds->current_capture_start (); + gdouble xstart = _trackview.editor().frame_to_pixel (frame_pos); gdouble xend; 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); rec_rect->property_x1() = xstart; rec_rect->property_y1() = 1.0; @@ -388,29 +449,28 @@ MidiStreamView::setup_rec_box () 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.session()->record_status() != Session::Recording || !_trackview.get_diskstream()->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; @@ -419,20 +479,16 @@ MidiStreamView::setup_rec_box () /* disconnect rapid update */ screen_update_connection.disconnect(); - - for (list::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,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end();) { list,RegionView*> >::iterator tmp; - + tmp = iter; ++tmp; @@ -440,7 +496,7 @@ MidiStreamView::setup_rec_box () iter = tmp; } - + rec_regions.clear(); // cerr << "\tclear " << rec_rects.size() << " rec rects\n"; @@ -450,9 +506,9 @@ MidiStreamView::setup_rec_box () RecBoxInfo &rect = (*iter); delete rect.rectangle; } - + rec_rects.clear(); - + } } } @@ -460,47 +516,46 @@ MidiStreamView::setup_rec_box () void MidiStreamView::update_rec_regions (boost::shared_ptr data, nframes_t start, nframes_t dur) { - ENSURE_GUI_THREAD (bind (mem_fun (*this, &MidiStreamView::update_rec_regions), data, start, dur)); + ENSURE_GUI_THREAD (*this, &MidiStreamView::update_rec_regions, data, start, dur) if (use_rec_regions) { uint32_t n = 0; bool update_range = false; - for (list,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) { - - list,RegionView*> >::iterator tmp; + for (list,RegionView*> >::iterator iter = rec_regions.begin(); + iter != rec_regions.end(); n++) { - tmp = iter; + list,RegionView*> >::iterator tmp = iter; ++tmp; - - boost::shared_ptr region = boost::dynamic_pointer_cast(iter->first); - if (!region || !iter->second) { + + if (!canvas_item_visible (rec_rects[n].rectangle)) { + /* rect already hidden, this region is done */ iter = tmp; continue; } - - if (!canvas_item_visible (rec_rects[n].rectangle)) { - /* rect already hidden, this region is done */ + + boost::shared_ptr region = boost::dynamic_pointer_cast(iter->first); + if (!region) { iter = tmp; continue; } - + nframes_t origlen = region->length(); - + if (region == rec_regions.back().first && rec_active) { 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 (start + dur - region->position(), this); region->thaw ("updated"); - + if (origlen == 1) { /* our special initial length */ iter->second = add_region_view_internal (region, false); @@ -509,27 +564,33 @@ MidiStreamView::update_rec_regions (boost::shared_ptr data, nframes_t /* 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; + ARDOUR::BeatsFramesConverter tconv(_trackview.session()->tempo_map(), region->position()); + const MidiModel::TimeType start_beats = tconv.from(start); + /* draw events */ MidiRegionView* mrv = (MidiRegionView*)iter->second; - for (size_t i=0; i < data->n_notes(); ++i) { - // FIXME: slooooooooow! + for (MidiModel::Notes::const_iterator i = data->note_lower_bound(start_beats); + i != data->notes().end(); ++i) { + + const boost::shared_ptr& note = *i; + + nframes_t note_start_frames = tconv.to(note->time()); + nframes_t note_end_frames = tconv.to(note->end_time()); - const boost::shared_ptr note = data->note_at(i); - - if (note->duration() > 0 && note->end_time() + region->position() > start) - mrv->resolve_note(note->note(), note->end_time()); + if (note->length() > 0 && note_end_frames + region->position() > start) + mrv->resolve_note(note->note(), note_end_frames); - if (note->time() + region->position() < start) + if (note_start_frames + region->position() < start) { continue; + } - if (note->time() + region->position() > start + dur) + if (note_start_frames + region->position() > start + dur) { break; - - mrv->add_note(note); + } if (note->note() < _lowest_note) { _lowest_note = note->note(); @@ -538,30 +599,32 @@ MidiStreamView::update_rec_regions (boost::shared_ptr data, nframes_t _highest_note = note->note(); update_range = true; } + + mrv->add_note (note, !update_range); } - + mrv->extend_active_notes(); } } } else { - + nframes_t nlen = _trackview.get_diskstream()->get_captured_frames(n); if (nlen != region->length()) { - if (region->source(0)->length() >= region->position() + nlen) { + if (region->source_length(0) >= region->position() + 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 */ iter->second = add_region_view_internal (region, false); } - + /* also hide rect */ ArdourCanvas::Item * rect = rec_rects[n].rectangle; rect->hide(); @@ -574,30 +637,37 @@ MidiStreamView::update_rec_regions (boost::shared_ptr data, nframes_t } if (update_range) - update_contents_y_position_and_height(); + update_contents_height(); } } void -MidiStreamView::rec_data_range_ready (jack_nframes_t start, jack_nframes_t dur, boost::weak_ptr weak_src) +MidiStreamView::rec_data_range_ready (nframes_t start, nframes_t cnt, boost::weak_ptr weak_src) { // 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)); - + + ENSURE_GUI_THREAD (*this, &MidiStreamView::rec_data_range_ready, start, cnt, weak_src) + boost::shared_ptr src (boost::dynamic_pointer_cast(weak_src.lock())); - - this->update_rec_regions (src->model(), start, dur); + + if (!src) { + return; + } + + if (start + cnt > last_rec_data_frame) { + last_rec_data_frame = start + cnt; + } + + this->update_rec_regions (src->model(), start, cnt); } 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()) { @@ -606,27 +676,30 @@ MidiStreamView::color_handler () } void -MidiStreamView::note_range_adjustment_changed() { +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) { + if (sum == _range_sum_cache) { //cerr << "cached" << endl; highest = (int) floor(sum); - } - else { + } 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()) { + if (lowest == _lowest_note && highest == _highest_note) { return; } - //cerr << "note range changed: " << lowest << " " << highest << endl; + //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; - set_note_range(lowest, highest); + _lowest_note = lowest; + _highest_note = highest; + apply_note_range(lowest, highest, true); } +