summaryrefslogtreecommitdiff
path: root/gtk2_ardour/midi_region_view.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2014-03-06 13:27:51 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2014-03-06 13:27:51 -0500
commitfeebabb330d9d61105b71bbac4d43b0f14454621 (patch)
tree21e4fe383e7a6e7076c36c084a39dcfee7d2b551 /gtk2_ardour/midi_region_view.cc
parent2784ce99e192777f2c38a4b37193aaa048cdb9ff (diff)
trivial API change for MidiRegionView::update_hit()
Diffstat (limited to 'gtk2_ardour/midi_region_view.cc')
-rw-r--r--gtk2_ardour/midi_region_view.cc15
1 files changed, 5 insertions, 10 deletions
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 289c5f7f54..d9a5ce4b6b 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -1437,9 +1437,7 @@ MidiRegionView::apply_note_range (uint8_t min, uint8_t max, bool force)
} else if (Hit* chit = dynamic_cast<Hit*>(event)) {
- const double diamond_size = update_hit (chit);
-
- chit->set_height (diamond_size);
+ update_hit (chit);
}
}
}
@@ -1675,19 +1673,18 @@ MidiRegionView::update_note (Note* ev, bool update_ghost_regions)
}
}
-double
+void
MidiRegionView::update_hit (Hit* ev)
{
boost::shared_ptr<NoteType> note = ev->note();
const framepos_t note_start_frames = source_beats_to_region_frames(note->time());
const double x = trackview.editor().sample_to_pixel(note_start_frames);
- const double diamond_size = midi_stream_view()->note_height() / 2.0;
- const double y = midi_stream_view()->note_to_y(note->note()) + ((diamond_size-2) / 4.0);
+ const double diamond_size = midi_stream_view()->note_height();
+ const double y = midi_stream_view()->note_to_y(note->note()) + (diamond_size/2.0);
ev->set_position (ArdourCanvas::Duple (x, y));
-
- return diamond_size;
+ ev->set_height (diamond_size);
}
/** Add a MIDI note to the view (with length).
@@ -1701,8 +1698,6 @@ MidiRegionView::add_note(const boost::shared_ptr<NoteType> note, bool visible)
{
NoteBase* event = 0;
- //ArdourCanvas::Group* const group = (ArdourCanvas::Group*) get_canvas_group();
-
if (midi_view()->note_mode() == Sustained) {
Note* ev_rect = new Note (*this, _note_group, note);