ardour/livetrax
13
0
Fork 0
Code

use a map to find GhostEvents by a pointer to Note.

Browse Source
This commit is contained in:
nick_m 2016-12-21 03:30:32 +11:00
parent eecc9ed743
commit bf75770939
2 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
gtk2_ardour/ghostregion.cc
View File

@ -272,8 +272,8 @@ MidiGhostRegion::set_colors()
_outline = UIConfiguration::instance().color ("ghost track midi outline"); _outline = UIConfiguration::instance().color ("ghost track midi outline");
for (EventList::iterator it = events.begin(); it != events.end(); ++it) { for (EventList::iterator it = events.begin(); it != events.end(); ++it) {
(*it)->item->set_fill_color (UIConfiguration::instance().color_mod((*it)->event->base_color(), "ghost track midi fill")); (*it).second->item->set_fill_color (UIConfiguration::instance().color_mod((*it).second->event->base_color(), "ghost track midi fill"));
(*it)->item->set_outline_color (_outline); (*it).second->item->set_outline_color (_outline);
} }
} }
@ -308,19 +308,18 @@ MidiGhostRegion::update_range ()
double const h = note_height(trackview, mv); double const h = note_height(trackview, mv);
for (EventList::iterator it = events.begin(); it != events.end(); ++it) { for (EventList::iterator it = events.begin(); it != events.end(); ++it) {
uint8_t const note_num = (*it)->event->note()->note(); uint8_t const note_num = (*it).second->event->note()->note();
if (note_num < mv->lowest_note() || note_num > mv->highest_note()) { if (note_num < mv->lowest_note() || note_num > mv->highest_note()) {
(*it)->item->hide(); (*it).second->item->hide();
} else { } else {
(*it)->item->show(); (*it).second->item->show();
double const y = note_y(trackview, mv, note_num); double const y = note_y(trackview, mv, note_num);
ArdourCanvas::Rectangle* rect = NULL; ArdourCanvas::Rectangle* rect = NULL;
ArdourCanvas::Polygon* poly = NULL; ArdourCanvas::Polygon* poly = NULL;
if ((rect = dynamic_cast<ArdourCanvas::Rectangle*>((*it)->item))) { if ((rect = dynamic_cast<ArdourCanvas::Rectangle*>((*it).second->item))) {
rect->set_y0 (y); rect->set (Rect (rect->x0(), y, rect->x1(), y + h));
rect->set_y1 (y + h); } else if ((poly = dynamic_cast<ArdourCanvas::Polygon*>((*it).second->item))) {
} else if ((poly = dynamic_cast<ArdourCanvas::Polygon*>((*it)->item))) {
Duple position = poly->position(); Duple position = poly->position();
position.y = y; position.y = y;
poly->set_position(position); poly->set_position(position);
@ -334,7 +333,7 @@ void
MidiGhostRegion::add_note (NoteBase* n) MidiGhostRegion::add_note (NoteBase* n)
{ {
GhostEvent* event = new GhostEvent (n, group); GhostEvent* event = new GhostEvent (n, group);
events.push_back (event); events.insert (make_pair (n->note(), event));
event->item->set_fill_color (UIConfiguration::instance().color_mod(n->base_color(), "ghost track midi fill")); event->item->set_fill_color (UIConfiguration::instance().color_mod(n->base_color(), "ghost track midi fill"));
event->item->set_outline_color (_outline); event->item->set_outline_color (_outline);
@ -367,7 +366,7 @@ void
MidiGhostRegion::clear_events() MidiGhostRegion::clear_events()
{ {
for (EventList::iterator it = events.begin(); it != events.end(); ++it) { for (EventList::iterator it = events.begin(); it != events.end(); ++it) {
delete *it; delete (*it).second;
} }
events.clear(); events.clear();
@ -380,7 +379,13 @@ MidiGhostRegion::clear_events()
void void
MidiGhostRegion::update_note (Note* note) MidiGhostRegion::update_note (Note* note)
{ {
GhostEvent* ev = find_event (note); EventList::iterator f = events.find (note->note());
if (f == events.end()) {
return;
}
GhostEvent* ev = (*f).second;
if (!ev) { if (!ev) {
return; return;
} }
@ -390,13 +395,20 @@ MidiGhostRegion::update_note (Note* note)
rect->set (ArdourCanvas::Rect (note->x0(), rect->y0(), note->x1(), rect->y1())); rect->set (ArdourCanvas::Rect (note->x0(), rect->y0(), note->x1(), rect->y1()));
} }
} }
/** Update the x positions of our representation of a parent's hit. /** Update the x positions of our representation of a parent's hit.
* @param hit The CanvasHit from the parent MidiRegionView. * @param hit The CanvasHit from the parent MidiRegionView.
*/ */
void void
MidiGhostRegion::update_hit (Hit* hit) MidiGhostRegion::update_hit (Hit* hit)
{ {
GhostEvent* ev = find_event (hit); EventList::iterator f = events.find (hit->note());
if (f == events.end()) {
return;
}
GhostEvent* ev = (*f).second;
if (!ev) { if (!ev) {
return; return;
} }
@ -413,13 +425,14 @@ MidiGhostRegion::update_hit (Hit* hit)
void void
MidiGhostRegion::remove_note (NoteBase* note) MidiGhostRegion::remove_note (NoteBase* note)
{ {
GhostEvent* ev = find_event (note); EventList::iterator f = events.find (note->note());
if (!ev) { if (f == events.end()) {
return; return;
} }
events.remove (ev); delete (*f).second;
delete ev; events.erase (f);
_optimization_iterator = events.end (); _optimization_iterator = events.end ();
} }
@ -439,13 +452,13 @@ MidiGhostRegion::find_event (NoteBase* parent)
++_optimization_iterator; ++_optimization_iterator;
} }
if (_optimization_iterator != events.end() && (*_optimization_iterator)->event == parent) { if (_optimization_iterator != events.end() && (*_optimization_iterator).second->event == parent) {
return *_optimization_iterator; return (*_optimization_iterator).second;
} }
for (_optimization_iterator = events.begin(); _optimization_iterator != events.end(); ++_optimization_iterator) { for (_optimization_iterator = events.begin(); _optimization_iterator != events.end(); ++_optimization_iterator) {
if ((*_optimization_iterator)->event == parent) { if ((*_optimization_iterator).second->event == parent) {
return *_optimization_iterator; return (*_optimization_iterator).second;
} }
} }

3
gtk2_ardour/ghostregion.h
View File

@ -119,8 +119,9 @@ private:
ArdourCanvas::Color _outline; ArdourCanvas::Color _outline;
MidiGhostRegion::GhostEvent* find_event (NoteBase*); MidiGhostRegion::GhostEvent* find_event (NoteBase*);
typedef Evoral::Note<Evoral::Beats> NoteType;
typedef std::list<MidiGhostRegion::GhostEvent*> EventList; typedef std::map<boost::shared_ptr<NoteType>, MidiGhostRegion::GhostEvent* > EventList;
EventList events; EventList events;
EventList::iterator _optimization_iterator; EventList::iterator _optimization_iterator;
}; };