more note performance work (dereference less).
[ardour.git] / gtk2_ardour / ghostregion.cc
index b48a0c1ad123cd974966e7f47881fed249aca066..bc286598ecb1035c66386020af160e5d9aadd5b0 100644 (file)
@@ -179,14 +179,12 @@ MidiGhostRegion::MidiGhostRegion(RegionView& rv,
                                  TimeAxisView& source_tv,
                                  double initial_unit_pos)
     : GhostRegion(rv, tv.ghost_group(), tv, source_tv, initial_unit_pos)
+    , _note_group (new ArdourCanvas::Container (group))
     , _optimization_iterator(events.end())
 {
        _outline = UIConfiguration::instance().color ("ghost track midi outline");
 
        base_rect->lower_to_bottom();
-       update_range ();
-
-       midi_view()->NoteRangeChanged.connect (sigc::mem_fun (*this, &MidiGhostRegion::update_range));
 }
 
 /**
@@ -203,29 +201,32 @@ MidiGhostRegion::MidiGhostRegion(RegionView& rv,
                   msv.trackview(),
                   source_tv,
                   initial_unit_pos)
+    , _note_group (new ArdourCanvas::Container (group))
     , _optimization_iterator(events.end())
 {
        _outline = UIConfiguration::instance().color ("ghost track midi outline");
 
        base_rect->lower_to_bottom();
-       update_range ();
-
-       midi_view()->NoteRangeChanged.connect (sigc::mem_fun (*this, &MidiGhostRegion::update_range));
 }
 
 MidiGhostRegion::~MidiGhostRegion()
 {
        clear_events ();
+       delete _note_group;
 }
 
 MidiGhostRegion::GhostEvent::GhostEvent (NoteBase* e, ArdourCanvas::Container* g)
        : event (e)
 {
-       Hit* hit = NULL;
+
        if (dynamic_cast<Note*>(e)) {
                item = new ArdourCanvas::Rectangle(
                        g, ArdourCanvas::Rect(e->x0(), e->y0(), e->x1(), e->y1()));
-       } else if ((hit = dynamic_cast<Hit*>(e))) {
+       } else {
+               Hit* hit = dynamic_cast<Hit*>(e);
+               if (!hit) {
+                       return;
+               }
                ArdourCanvas::Polygon* poly = new ArdourCanvas::Polygon(g);
                poly->set(Hit::points(e->y1() - e->y0()));
                poly->set_position(hit->position());
@@ -262,7 +263,7 @@ void
 MidiGhostRegion::set_height ()
 {
        GhostRegion::set_height();
-       update_range();
+       update_contents_height ();
 }
 
 void
@@ -272,8 +273,8 @@ MidiGhostRegion::set_colors()
        _outline = UIConfiguration::instance().color ("ghost track midi outline");
 
        for (EventList::iterator it = events.begin(); it != events.end(); ++it) {
-               (*it).second->item->set_fill_color (UIConfiguration::instance().color_mod((*it).second->event->base_color(), "ghost track midi fill"));
-               (*it).second->item->set_outline_color (_outline);
+               it->second->item->set_fill_color (UIConfiguration::instance().color_mod((*it).second->event->base_color(), "ghost track midi fill"));
+               it->second->item->set_outline_color (_outline);
        }
 }
 
@@ -297,7 +298,7 @@ note_y(TimeAxisView& trackview, MidiStreamView* mv, uint8_t note_num)
 }
 
 void
-MidiGhostRegion::update_range ()
+MidiGhostRegion::update_contents_height ()
 {
        MidiStreamView* mv = midi_view();
 
@@ -308,23 +309,17 @@ MidiGhostRegion::update_range ()
        double const h = note_height(trackview, mv);
 
        for (EventList::iterator it = events.begin(); it != events.end(); ++it) {
-               uint8_t const note_num = (*it).second->event->note()->note();
+               uint8_t const note_num = it->second->event->note()->note();
 
-               if (note_num < mv->lowest_note() || note_num > mv->highest_note()) {
-                       (*it).second->item->hide();
-               } else {
-                       (*it).second->item->show();
-                       double const y = note_y(trackview, mv, note_num);
-                       ArdourCanvas::Rectangle* rect = NULL;
-                       ArdourCanvas::Polygon*   poly = NULL;
-                       if ((rect = dynamic_cast<ArdourCanvas::Rectangle*>((*it).second->item))) {
-                               rect->set (Rect (rect->x0(), y, rect->x1(), y + h));
-                       } else if ((poly = dynamic_cast<ArdourCanvas::Polygon*>((*it).second->item))) {
-                               Duple position = poly->position();
-                               position.y = y;
-                               poly->set_position(position);
-                               poly->set(Hit::points(h));
-                       }
+               double const y = note_y(trackview, mv, note_num);
+
+               if ((_tmp_rect = dynamic_cast<ArdourCanvas::Rectangle*>(it->second->item))) {
+                       _tmp_rect->set (ArdourCanvas::Rect (_tmp_rect->x0(), y, _tmp_rect->x1(), y + h));
+               } else if ((_tmp_poly = dynamic_cast<ArdourCanvas::Polygon*>(it->second->item))) {
+                       Duple position = _tmp_poly->position();
+                       position.y = y;
+                       _tmp_poly->set_position(position);
+                       _tmp_poly->set(Hit::points(h));
                }
        }
 }
@@ -332,7 +327,7 @@ MidiGhostRegion::update_range ()
 void
 MidiGhostRegion::add_note (NoteBase* n)
 {
-       GhostEvent* event = new GhostEvent (n, group);
+       GhostEvent* event = new GhostEvent (n, _note_group);
        events.insert (make_pair (n->note(), event));
 
        event->item->set_fill_color (UIConfiguration::instance().color_mod(n->base_color(), "ghost track midi fill"));
@@ -344,19 +339,18 @@ MidiGhostRegion::add_note (NoteBase* n)
                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 (note_num < mv->lowest_note() || note_num > mv->highest_note()) {
+               if (n->x0() < base_rect->x0() || n->x1() > base_rect->x1()) {
+                       event->item->hide();
+               } else if (note_num < mv->lowest_note() || note_num > mv->highest_note()) {
                        event->item->hide();
                } else {
-                       ArdourCanvas::Rectangle* rect = NULL;
-                       ArdourCanvas::Polygon*   poly = NULL;
-                       if ((rect = dynamic_cast<ArdourCanvas::Rectangle*>(event->item))) {
-                               rect->set (ArdourCanvas::Rect (rect->x0(), y, rect->x1(), y + h));
-                       } else if ((poly = dynamic_cast<ArdourCanvas::Polygon*>(event->item))) {
-                               Duple position = poly->position();
+                       if ((_tmp_rect = dynamic_cast<ArdourCanvas::Rectangle*>(event->item))) {
+                               _tmp_rect->set (ArdourCanvas::Rect (_tmp_rect->x0(), y, _tmp_rect->x1(), y + h));
+                       } else if ((_tmp_poly = dynamic_cast<ArdourCanvas::Polygon*>(event->item))) {
+                               Duple position = _tmp_poly->position();
                                position.y = y;
-                               poly->set_position(position);
-                               poly->set(Hit::points(h));
+                               _tmp_poly->set_position(position);
+                               _tmp_poly->set(Hit::points(h));
                        }
                }
        }
@@ -365,34 +359,41 @@ MidiGhostRegion::add_note (NoteBase* n)
 void
 MidiGhostRegion::clear_events()
 {
-       for (EventList::iterator it = events.begin(); it != events.end(); ++it) {
-               delete (*it).second;
-       }
-
-       events.clear();
-       _optimization_iterator = events.end ();
+       _note_group->clear (true);
+       events.clear ();
+       _optimization_iterator = events.end();
 }
 
 /** Update the x positions of our representation of a parent's note.
  *  @param parent The CanvasNote from the parent MidiRegionView.
  */
 void
-MidiGhostRegion::update_note (Note* note)
+MidiGhostRegion::update_note (Note* note, bool hide)
 {
-       EventList::iterator f = events.find (note->note());
-       if (f == events.end()) {
+       MidiStreamView* mv = midi_view();
+
+       if (!mv) {
                return;
        }
 
-       GhostEvent* ev = (*f).second;
+       GhostEvent* ev = find_event (note);
 
        if (!ev) {
                return;
        }
 
-       ArdourCanvas::Rectangle* rect = NULL;
-       if ((rect = dynamic_cast<ArdourCanvas::Rectangle*>(ev->item))) {
-               rect->set (ArdourCanvas::Rect (note->x0(), rect->y0(), note->x1(), rect->y1()));
+       uint8_t const note_num = note->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 ((_tmp_rect = dynamic_cast<ArdourCanvas::Rectangle*>(ev->item))) {
+                       _tmp_rect->set (ArdourCanvas::Rect (note->x0(), y, note->x1(), y + h));
+               }
+               ev->item->show();
        }
 }
 
@@ -400,25 +401,36 @@ MidiGhostRegion::update_note (Note* note)
  *  @param hit The CanvasHit from the parent MidiRegionView.
  */
 void
-MidiGhostRegion::update_hit (Hit* hit)
+MidiGhostRegion::update_hit (Hit* hit, bool hide)
 {
-       EventList::iterator f = events.find (hit->note());
-       if (f == events.end()) {
+       MidiStreamView* mv = midi_view();
+
+       if (!mv) {
                return;
        }
 
-       GhostEvent* ev = (*f).second;
+       GhostEvent* ev = find_event (hit);
 
        if (!ev) {
                return;
        }
 
-       ArdourCanvas::Polygon*   poly = NULL;
-       if ((poly = dynamic_cast<ArdourCanvas::Polygon*>(ev->item))) {
-               ArdourCanvas::Duple ppos = hit->position();
-               ArdourCanvas::Duple gpos = poly->position();
-               gpos.x = ppos.x;
-               poly->set_position(gpos);
+       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 ((_tmp_poly = dynamic_cast<ArdourCanvas::Polygon*>(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();
        }
 }
 
@@ -430,7 +442,7 @@ MidiGhostRegion::remove_note (NoteBase* note)
                return;
        }
 
-       delete (*f).second;
+       delete f->second;
        events.erase (f);
 
        _optimization_iterator = events.end ();
@@ -450,16 +462,14 @@ MidiGhostRegion::find_event (NoteBase* parent)
 
        if (_optimization_iterator != events.end()) {
                ++_optimization_iterator;
+               if (_optimization_iterator != events.end() && _optimization_iterator->second->event == parent) {
+                       return _optimization_iterator->second;
+               }
        }
 
-       if (_optimization_iterator != events.end() && (*_optimization_iterator).second->event == parent) {
-               return (*_optimization_iterator).second;
-       }
-
-       for (_optimization_iterator = events.begin(); _optimization_iterator != events.end(); ++_optimization_iterator) {
-               if ((*_optimization_iterator).second->event == parent) {
-                       return (*_optimization_iterator).second;
-               }
+       _optimization_iterator = events.find (parent->note());
+       if (_optimization_iterator != events.end()) {
+               return _optimization_iterator->second;
        }
 
        return 0;