X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_streamview.cc;h=d581e662677fa954d36c62da1e915ca51b93fad8;hb=ffaf827d93e56052049fc00234283842564821d5;hp=a2b4229650eb6f835b085f4036e7783c7c03c9b2;hpb=49763a55c9bcbff2cb7844f36df777bbfadab172;p=ardour.git diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index a2b4229650..d581e66267 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -29,7 +29,6 @@ #include #include #include -#include #include #include @@ -46,7 +45,7 @@ #include "gui_thread.h" #include "utils.h" #include "simplerect.h" -#include "simpleline.h" +#include "lineset.h" using namespace std; using namespace ARDOUR; @@ -55,36 +54,79 @@ 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) { 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 (); + + /* 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() = 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->lower_to_bottom(); + + ColorsChanged.connect(mem_fun(*this, &MidiStreamView::draw_note_lines)); - _note_line_group = new ArdourCanvas::Group (*canvas_group); + note_range_adjustment.set_page_size(_highest_note - _lowest_note); + note_range_adjustment.set_value(_lowest_note); - 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; - } + note_range_adjustment.signal_value_changed().connect (mem_fun (*this, &MidiStreamView::note_range_adjustment_changed)); } MidiStreamView::~MidiStreamView () { } +static void +veto_note_range(uint8_t& min, uint8_t& max) +{ + /* Legal notes, thanks */ + if (max > 127) + max = 127; + if (min > 127) + min = 127; + + /* 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) +MidiStreamView::add_region_view_internal (boost::shared_ptr r, bool wfd, bool recording) { boost::shared_ptr region = boost::dynamic_pointer_cast (r); @@ -101,7 +143,7 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr r, bool wfd) /* 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; @@ -113,20 +155,10 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr r, bool wfd) 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(); - } - + /* 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(_lowest_note + 11)); - /* catch regionview going away */ region->GoingAway.connect (bind (mem_fun (*this, &MidiStreamView::remove_region_view), region)); @@ -140,20 +172,18 @@ 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) 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->display_model(source->model()); } @@ -162,7 +192,23 @@ void MidiStreamView::display_diskstream (boost::shared_ptr ds) { StreamView::display_diskstream(ds); - draw_note_separators(); + draw_note_lines(); + NoteRangeChanged(); +} + +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 @@ -171,33 +217,52 @@ MidiStreamView::redisplay_diskstream () { list::iterator i, tmp; + _range_dirty = false; + _data_note_min = 127; + _data_note_max = 0; + for (i = region_views.begin(); i != region_views.end(); ++i) { - (*i)->enable_display(true); // FIXME: double display, remove (*i)->set_valid (false); + (*i)->enable_display (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(); + if (mrv) { + mrv->midi_region()->midi_source(0)->load_model(); + _range_dirty = update_data_note_range( + mrv->midi_region()->model()->lowest_note(), + mrv->midi_region()->model()->highest_note()); + } + } + + // No notes, use default range + if (!_range_dirty) { + _data_note_min = 60; + _data_note_max = 71; } - //_lowest_note = 60; // middle C - //_highest_note = _lowest_note + 11; + bool range_changed = false; + // Extend visible range to show newly recorded data, if necessary + if (_data_note_min < _lowest_note) { + _lowest_note = _data_note_min; + range_changed = true; + } + if (_data_note_max > _highest_note) { + _highest_note = _data_note_max; + range_changed = true; + } + + veto_note_range(_lowest_note, _highest_note); + if (_trackview.is_midi_track()) { - _trackview.get_diskstream()->playlist()->foreach_region (static_cast(this), &StreamView::add_region_view); + _trackview.get_diskstream()->playlist()->foreach_region ( + static_cast(this), &StreamView::add_region_view); } - /* 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; - } + RegionViewList copy; + /* Place regions */ for (i = region_views.begin(); i != region_views.end(); ) { tmp = i; tmp++; @@ -205,71 +270,140 @@ MidiStreamView::redisplay_diskstream () if (!(*i)->is_valid()) { delete *i; region_views.erase (i); + i = tmp; + continue; } else { (*i)->enable_display(true); - (*i)->set_y_position_and_height(0, height); // apply note range + (*i)->set_height(height); // apply note range + } + + /* Sort regionviews by layer so that when we call region_layered () + the canvas layering works out (in non-stacked mode). */ + + if (copy.size() == 0) { + copy.push_front((*i)); + i = tmp; + continue; + } + + RegionViewList::iterator k = copy.begin(); + RegionViewList::iterator l = copy.end(); + l--; + + if ((*i)->region()->layer() <= (*k)->region()->layer()) { + copy.push_front((*i)); + i = tmp; + continue; + } else if ((*i)->region()->layer() >= (*l)->region()->layer()) { + copy.push_back((*i)); + i = tmp; + continue; + } + + for (RegionViewList::iterator j = copy.begin(); j != copy.end(); ++j) { + if ((*j)->region()->layer() >= (*i)->region()->layer()) { + copy.insert(j, (*i)); + break; + } } i = tmp; } - /* now fix layering */ - - for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) { - region_layered (*i); + /* Fix canvas layering */ + for (RegionViewList::iterator j = copy.begin(); j != copy.end(); ++j) { + region_layered (*j); } - draw_note_separators(); + /* Update note range and re-draw note lines if necessary */ + apply_note_range(_lowest_note, _highest_note); + NoteRangeChanged(); } 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() = height; + draw_note_lines(); } 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(); + double y; + double prev_y = contents_height(); + uint32_t color; + + _note_lines->clear(); + + 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); } +void +MidiStreamView::apply_note_range(uint8_t lowest, uint8_t highest) +{ + _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(); + for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { + ((MidiRegionView*)(*i))->apply_note_range(lowest, highest); + } + + NoteRangeChanged(); +} + void -MidiStreamView::update_bounds(uint8_t note_num) +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 () { @@ -336,7 +470,7 @@ MidiStreamView::setup_rec_box () 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(); @@ -425,18 +559,19 @@ MidiStreamView::update_rec_regions (boost::shared_ptr data, nframes_t tmp = iter; ++tmp; - - 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->second) { iter = tmp; continue; } - boost::shared_ptr region = boost::dynamic_pointer_cast(iter->first); - if (!region) { + if (!canvas_item_visible (rec_rects[n].rectangle)) { + /* rect already hidden, this region is done */ + iter = tmp; continue; } - + nframes_t origlen = region->length(); if (region == rec_regions.back().first && rec_active) { @@ -467,24 +602,26 @@ MidiStreamView::update_rec_regions (boost::shared_ptr data, nframes_t MidiRegionView* mrv = (MidiRegionView*)iter->second; for (size_t i=0; i < data->n_notes(); ++i) { - const Note& note = data->note_at(i); + // FIXME: slooooooooow! + + const boost::shared_ptr 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) + if (note->time() + region->position() < start) continue; - if (note.time() + region->position() > start + dur) + if (note->time() + region->position() > start + dur) break; - mrv->add_note(note, true); - - if (note.duration() > 0 && note.end_time() >= start) - mrv->resolve_note(note.note(), note.end_time()); + mrv->add_note(note); - if (note.note() < _lowest_note) { - _lowest_note = note.note(); + if (note->note() < _lowest_note) { + _lowest_note = note->note(); update_range = true; - } else if (note.note() > _highest_note) { - _highest_note = note.note(); + } else if (note->note() > _highest_note) { + _highest_note = note->note(); update_range = true; } } @@ -523,7 +660,7 @@ MidiStreamView::update_rec_regions (boost::shared_ptr data, nframes_t } if (update_range) - update_contents_y_position_and_height(); + update_contents_height(); } } @@ -542,15 +679,42 @@ MidiStreamView::rec_data_range_ready (jack_nframes_t start, jack_nframes_t dur, void MidiStreamView::color_handler () { - //case cMidiTrackBase: if (_trackview.is_midi_track()) { - canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get(); + //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();; + //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); +} +