X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fghostregion.cc;h=b531bd9aa827c8c0c0d5cf90e0ca9a4748a19b73;hb=735d791e420c3e4944fdbc8ac7f6a26251d90d87;hp=f48680cef7fedc297556722d0454e3452825f38b;hpb=5091a043627f0506252a7d18b56e47dc95e99eca;p=ardour.git diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc index f48680cef7..b531bd9aa8 100644 --- a/gtk2_ardour/ghostregion.cc +++ b/gtk2_ardour/ghostregion.cc @@ -17,20 +17,23 @@ */ +#include "evoral/Note.hpp" + #include "ardour/parameter_descriptor.h" -#include "evoral/Note.hpp" #include "canvas/container.h" #include "canvas/polygon.h" #include "canvas/rectangle.h" -#include "canvas/wave_view.h" #include "canvas/debug.h" +#include "waveview/wave_view.h" + #include "automation_time_axis.h" #include "ghostregion.h" #include "midi_streamview.h" #include "midi_time_axis.h" #include "region_view.h" +#include "midi_region_view.h" #include "rgb_macros.h" #include "note.h" #include "hit.h" @@ -125,7 +128,7 @@ AudioGhostRegion::AudioGhostRegion(RegionView& rv, void AudioGhostRegion::set_samples_per_pixel (double fpp) { - for (vector::iterator i = waves.begin(); i != waves.end(); ++i) { + for (vector::iterator i = waves.begin(); i != waves.end(); ++i) { (*i)->set_samples_per_pixel (fpp); } } @@ -133,7 +136,7 @@ AudioGhostRegion::set_samples_per_pixel (double fpp) void AudioGhostRegion::set_height () { - vector::iterator i; + vector::iterator i; uint32_t n; GhostRegion::set_height(); @@ -174,12 +177,13 @@ AudioGhostRegion::set_colors () * @param tv TimeAxisView that this ghost region is on. * @param source_tv TimeAxisView that we are the ghost for. */ -MidiGhostRegion::MidiGhostRegion(RegionView& rv, +MidiGhostRegion::MidiGhostRegion(MidiRegionView& rv, TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos) : GhostRegion(rv, tv.ghost_group(), tv, source_tv, initial_unit_pos) , _note_group (new ArdourCanvas::Container (group)) + , parent_mrv (rv) , _optimization_iterator(events.end()) { _outline = UIConfiguration::instance().color ("ghost track midi outline"); @@ -192,7 +196,7 @@ MidiGhostRegion::MidiGhostRegion(RegionView& rv, * @param msv MidiStreamView that this ghost region is on. * @param source_tv TimeAxisView that we are the ghost for. */ -MidiGhostRegion::MidiGhostRegion(RegionView& rv, +MidiGhostRegion::MidiGhostRegion(MidiRegionView& rv, MidiStreamView& msv, TimeAxisView& source_tv, double initial_unit_pos) @@ -202,6 +206,7 @@ MidiGhostRegion::MidiGhostRegion(RegionView& rv, source_tv, initial_unit_pos) , _note_group (new ArdourCanvas::Container (group)) + , parent_mrv (rv) , _optimization_iterator(events.end()) { _outline = UIConfiguration::instance().color ("ghost track midi outline"); @@ -340,13 +345,13 @@ MidiGhostRegion::add_note (NoteBase* n) MidiStreamView* mv = midi_view(); if (mv) { - uint8_t const note_num = n->note()->note(); - double const h = note_height(trackview, mv); - double const y = note_y(trackview, mv, note_num); if (!n->item()->visible()) { event->item->hide(); } else { + uint8_t const note_num = n->note()->note(); + double const h = note_height(trackview, mv); + double const y = note_y(trackview, mv, note_num); if (!event->is_hit) { _tmp_rect = static_cast(event->item); _tmp_rect->set (ArdourCanvas::Rect (_tmp_rect->x0(), y, _tmp_rect->x1(), y + h)); @@ -369,11 +374,11 @@ MidiGhostRegion::clear_events() _optimization_iterator = events.end(); } -/** Update the x positions of our representation of a parent's note. - * @param parent The CanvasNote from the parent MidiRegionView. +/** Update the positions of our representation of a note. + * @param ev The GhostEvent from the parent MidiRegionView. */ void -MidiGhostRegion::update_note (Note* note, bool hide) +MidiGhostRegion::update_note (GhostEvent* ev) { MidiStreamView* mv = midi_view(); @@ -381,32 +386,20 @@ MidiGhostRegion::update_note (Note* note, bool hide) return; } - GhostEvent* ev = find_event (note); - - if (!ev) { - return; - } - - uint8_t const note_num = note->note()->note(); + _tmp_rect = static_cast(ev->item); + uint8_t const note_num = ev->event->note()->note(); double const y = note_y(trackview, mv, note_num); double const h = note_height(trackview, mv); - if (hide) { - ev->item->hide(); - } else if (!ev->is_hit) { - _tmp_rect = static_cast(ev->item); - _tmp_rect->set (ArdourCanvas::Rect (note->x0(), y, note->x1(), y + h)); - - ev->item->show(); - } + _tmp_rect->set (ArdourCanvas::Rect (ev->event->x0(), y, ev->event->x1(), y + h)); } -/** Update the x positions of our representation of a parent's hit. - * @param hit The CanvasHit from the parent MidiRegionView. +/** Update the positions of our representation of a parent's hit. + * @param ev The GhostEvent from the parent MidiRegionView. */ void -MidiGhostRegion::update_hit (Hit* hit, bool hide) +MidiGhostRegion::update_hit (GhostEvent* ev) { MidiStreamView* mv = midi_view(); @@ -414,30 +407,19 @@ MidiGhostRegion::update_hit (Hit* hit, bool hide) return; } - GhostEvent* ev = find_event (hit); - - if (!ev) { - return; - } + _tmp_poly = static_cast(ev->item); uint8_t const note_num = ev->event->note()->note(); - double const h = note_height(trackview, mv); double const y = note_y(trackview, mv, note_num); - if (hide) { - ev->item->hide(); - } else if (ev->is_hit) { - _tmp_poly = static_cast(ev->item); - ArdourCanvas::Duple ppos = hit->position(); - ArdourCanvas::Duple gpos = _tmp_poly->position(); - gpos.x = ppos.x; - gpos.y = y; - _tmp_poly->set_position(gpos); - _tmp_poly->set(Hit::points(h)); - - ev->item->show(); - } + ArdourCanvas::Duple ppos = ev->item->position(); + ArdourCanvas::Duple gpos = _tmp_poly->position(); + gpos.x = ppos.x; + gpos.y = y; + + _tmp_poly->set_position(gpos); + _tmp_poly->set(Hit::points(h)); } void @@ -453,6 +435,31 @@ MidiGhostRegion::remove_note (NoteBase* note) _optimization_iterator = events.end (); } +void +MidiGhostRegion::redisplay_model () +{ + /* we rely on the parent MRV having removed notes not in the model */ + for (EventList::iterator i = events.begin(); i != events.end(); ) { + + boost::shared_ptr note = i->first; + GhostEvent* cne = i->second; + const bool visible = (note->note() >= parent_mrv._current_range_min) && + (note->note() <= parent_mrv._current_range_max); + + if (visible) { + if (cne->is_hit) { + update_hit (cne); + } else { + update_note (cne); + } + cne->item->show (); + } else { + cne->item->hide (); + } + + ++i; + } +} /** Given a note in our parent region (ie the actual MidiRegionView), find our * representation of it. @@ -460,7 +467,7 @@ MidiGhostRegion::remove_note (NoteBase* note) */ MidiGhostRegion::GhostEvent * -MidiGhostRegion::find_event (NoteBase* parent) +MidiGhostRegion::find_event (boost::shared_ptr parent) { /* we are using _optimization_iterator to speed up the common case where a caller is going through our notes in order. @@ -468,12 +475,12 @@ MidiGhostRegion::find_event (NoteBase* parent) if (_optimization_iterator != events.end()) { ++_optimization_iterator; - if (_optimization_iterator != events.end() && _optimization_iterator->second->event == parent) { + if (_optimization_iterator != events.end() && _optimization_iterator->first == parent) { return _optimization_iterator->second; } } - _optimization_iterator = events.find (parent->note()); + _optimization_iterator = events.find (parent); if (_optimization_iterator != events.end()) { return _optimization_iterator->second; }