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");
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");
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))) {
+ is_hit = false;
+ } 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());
item = poly;
+ is_hit = true;
}
CANVAS_DEBUG_NAME (item, "ghost note item");
_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);
}
}
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();
double const y = note_y(trackview, mv, note_num);
- if ((_tmp_rect = dynamic_cast<ArdourCanvas::Rectangle*>((*it).second->item))) {
+ if (!it->second->is_hit) {
+ _tmp_rect = static_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))) {
+ } else {
+ _tmp_poly = static_cast<ArdourCanvas::Polygon*>(it->second->item);
Duple position = _tmp_poly->position();
position.y = y;
_tmp_poly->set_position(position);
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"));
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 (note_num < mv->lowest_note() || note_num > mv->highest_note()) {
+ if (!n->item()->visible()) {
event->item->hide();
} else {
- if ((_tmp_rect = dynamic_cast<ArdourCanvas::Rectangle*>(event->item))) {
+ 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<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))) {
+ } else {
+ _tmp_poly = static_cast<ArdourCanvas::Polygon*>(event->item);
Duple position = _tmp_poly->position();
position.y = y;
_tmp_poly->set_position(position);
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)
{
MidiStreamView* mv = midi_view();
return;
}
- GhostEvent* ev = find_event (note);
+ GhostEvent* ev = find_event (note->note());
if (!ev) {
return;
}
- uint8_t const note_num = note->note()->note();
+ if (hide) {
+ ev->item->hide();
+ } else if (!ev->is_hit) {
+ _tmp_rect = static_cast<ArdourCanvas::Rectangle*>(ev->item);
- double const y = note_y(trackview, mv, note_num);
- double const h = note_height(trackview, mv);
+ uint8_t const note_num = note->note()->note();
+ double const y = note_y(trackview, mv, note_num);
+ double const h = note_height(trackview, mv);
+
+ _tmp_rect->set (ArdourCanvas::Rect (note->x0(), y, note->x1(), y + h));
- if (note_num < mv->lowest_note() || note_num > mv->highest_note()) {
- 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();
}
}
* @param hit The CanvasHit from the parent MidiRegionView.
*/
void
-MidiGhostRegion::update_hit (Hit* hit)
+MidiGhostRegion::update_hit (Hit* hit, bool hide)
{
MidiStreamView* mv = midi_view();
return;
}
- GhostEvent* ev = find_event (hit);
+ GhostEvent* ev = find_event (hit->note());
if (!ev) {
return;
}
- 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 (note_num < mv->lowest_note() || note_num > mv->highest_note()) {
+ 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));
- }
+ } else if (ev->is_hit) {
+ _tmp_poly = static_cast<ArdourCanvas::Polygon*>(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);
+
+ 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();
}
}
return;
}
- delete (*f).second;
+ delete f->second;
events.erase (f);
_optimization_iterator = events.end ();
*/
MidiGhostRegion::GhostEvent *
-MidiGhostRegion::find_event (NoteBase* parent)
+MidiGhostRegion::find_event (boost::shared_ptr<NoteType> parent)
{
/* we are using _optimization_iterator to speed up the common case where a caller
is going through our notes in order.
if (_optimization_iterator != events.end()) {
++_optimization_iterator;
+ if (_optimization_iterator != events.end() && _optimization_iterator->first == parent) {
+ return _optimization_iterator->second;
+ }
}
- if (_optimization_iterator != events.end() && (*_optimization_iterator).second->event == 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;
+ return _optimization_iterator->second;
}
return 0;
projects / ardour.git / blobdiff