ardour/livetrax
13
0
Fork 0
Code

Slightly clean up and fix unwanted display of percussive notes outside the note range. Should fix #3500.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7904 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-10-18 19:59:41 +00:00
parent 269590e1bf
commit 471ca9b1f5
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk2_ardour/midi_region_view.cc
View File

@ -1226,15 +1226,9 @@ MidiRegionView::apply_note_range (uint8_t min, uint8_t max, bool force)
} else if (CanvasHit* chit = dynamic_cast<CanvasHit*>(event)) {
double x = trackview.editor().frame_to_pixel(
beats_to_frames(note->time()) - _region->start());
const double diamond_size = midi_stream_view()->note_height() / 2.0;
double y = midi_stream_view()->note_to_y(event->note()->note())
+ ((diamond_size-2.0) / 4.0);
const double diamond_size = update_hit (chit);
chit->set_height (diamond_size);
chit->move (x - chit->x1(), y - chit->y1());
chit->show ();
}
}
}
@ -1432,7 +1426,7 @@ MidiRegionView::update_note (CanvasNote* ev)
}
}
void
double
MidiRegionView::update_hit (CanvasHit* ev)
{
boost::shared_ptr<NoteType> note = ev->note();
@ -1443,6 +1437,8 @@ MidiRegionView::update_hit (CanvasHit* ev)
const double y = midi_stream_view()->note_to_y(note->note()) + ((diamond_size-2) / 4.0);
ev->move_to (x, y);
return diamond_size;
}
/** Add a MIDI note to the view (with length).

2
gtk2_ardour/midi_region_view.h
View File

@ -402,7 +402,7 @@ class MidiRegionView : public RegionView
Events::iterator _optimization_iterator;
void update_note (ArdourCanvas::CanvasNote*);
void update_hit (ArdourCanvas::CanvasHit*);
double update_hit (ArdourCanvas::CanvasHit *);
void create_ghost_note (double, double);
void update_ghost_note (double, double);