#include "ardour/operations.h"
#include "ardour/session.h"
-#include "evoral/Parameter.hpp"
-#include "evoral/Event.hpp"
-#include "evoral/Control.hpp"
+#include "evoral/Parameter.h"
+#include "evoral/Event.h"
+#include "evoral/Control.h"
#include "evoral/midi_util.h"
#include "canvas/debug.h"
}
}
- midi_view()->midi_track()->midi_playlist()->region_edited (_region, _note_diff_command);
-
if (as_subcommand) {
_model->apply_command_as_subcommand (*trackview.session(), _note_diff_command);
} else {
}
_marked_for_velocity.clear();
+
if (commit) {
trackview.editor().commit_reversible_command ();
}
const samplecnt_t zoom = trackview.editor().get_current_zoom();
if (zoom != _last_display_zoom) {
/* Update resolved canvas notes to reflect changes in zoom without
- touching model. Leave active notes (with length 0) alone since
+ touching model. Leave active notes (with length max) alone since
they are being extended. */
for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
- if (i->second->note()->length() > 0) {
+ if (i->second->note()->end_time() != std::numeric_limits<Temporal::Beats>::max()) {
update_note(i->second);
}
}
display_periodic_messages = false;
}
+ const boost::shared_ptr<MidiRegion> mregion (midi_region());
+
for (MidiModel::SysExes::const_iterator i = _model->sysexes().begin(); i != _model->sysexes().end(); ++i) {
MidiModel::SysExPtr sysex_ptr = *i;
Temporal::Beats time = sysex_ptr->time();
}
// Show unless message is beyond the region bounds
-// XXX REQUIRES APPROPRIATE OPERATORS FOR Temporal::Beats and samplepos? say what?
-#warning paul fix this
-// if (time - _region->start() >= _region->length() || time < _region->start()) {
-// sysex->hide();
-// } else {
-// sysex->show();
-// }
+ if (time - mregion->start_beats() >= mregion->length_beats() || time < mregion->start_beats()) {
+ sysex->hide();
+ } else {
+ sysex->show();
+ }
}
}
/** Resolve an active MIDI note (while recording).
*/
void
-MidiRegionView::resolve_note(uint8_t note, Temporal::Beats end_time)
+MidiRegionView::resolve_note (uint8_t note, Temporal::Beats end_time)
{
if (midi_view()->note_mode() != Sustained) {
return;
if (_active_notes && _active_notes[note]) {
/* Set note length so update_note() works. Note this is a local note
for recording, not from a model, so we can safely mess with it. */
- _active_notes[note]->note()->set_length(
- end_time - _active_notes[note]->note()->time());
+ _active_notes[note]->note()->set_length (end_time - _active_notes[note]->note()->time());
/* End time is relative to the region being recorded. */
- const samplepos_t end_time_samples = region_beats_to_region_samples(end_time);
+ const samplepos_t end_time_samples = region_beats_to_region_samples (end_time);
_active_notes[note]->set_x1 (trackview.editor().sample_to_pixel(end_time_samples));
_active_notes[note]->set_outline_all ();
for (unsigned i = 0; i < 128; ++i) {
if (_active_notes[i]) {
- _active_notes[i]->set_x1(
- trackview.editor().sample_to_pixel(_region->length()));
+ _active_notes[i]->set_x1 (trackview.editor().sample_to_pixel(_region->length()));
}
}
}
const double session_source_start = _region->quarter_note() - mr->start_beats();
const samplepos_t note_start_samples = map.sample_at_quarter_note (note->time().to_double() + session_source_start) - _region->position();
- const double x0 = trackview.editor().sample_to_pixel (note_start_samples);
+ const double x0 = max (0.,trackview.editor().sample_to_pixel (note_start_samples));
double x1;
const double y0 = 1 + floor(note_to_y(note->note()));
double y1;
- /* trim note display to not overlap the end of its region */
- if (note->length().to_double() > 0.0) {
+ if (note->length() == 0) {
+
+ /* special case actual zero-length notes */
+
+ x1 = x0 + 1.;
+
+ } else if (note->end_time() != std::numeric_limits<Temporal::Beats>::max()) {
+
+ /* normal note */
+
double note_end_time = note->end_time().to_double();
- if (note_end_time > mr->start_beats() + mr->length_beats()) {
+ if (note->end_time() > mr->start_beats() + mr->length_beats()) {
note_end_time = mr->start_beats() + mr->length_beats();
}
const samplepos_t note_end_samples = map.sample_at_quarter_note (session_source_start + note_end_time) - _region->position();
x1 = std::max(1., trackview.editor().sample_to_pixel (note_end_samples)) - 1;
+
} else {
+
+ /* nascent note currently being recorded, noteOff has not yet arrived */
+
x1 = std::max(1., trackview.editor().sample_to_pixel (_region->length())) - 1;
}
ev->set (ArdourCanvas::Rect (x0, y0, x1, y1));
ev->set_velocity (note->velocity()/127.0);
- if (!note->length()) {
+ if (note->end_time() == std::numeric_limits<Temporal::Beats>::max()) {
if (_active_notes && note->note() < 128) {
Note* const old_rect = _active_notes[note->note()];
if (old_rect) {
/** Add a MIDI note to the view (with length).
*
- * If in sustained mode, notes with length 0 will be considered active
- * notes, and resolve_note should be called when the corresponding note off
- * event arrives, to properly display the note.
+ * If in sustained mode, notes with an end at numeric_limits<Beats>::max() will be
+ * considered active notes, and resolve_note should be called when the
+ * corresponding note off event arrives, to properly display the note.
*/
NoteBase*
MidiRegionView::add_note(const boost::shared_ptr<NoteType> note, bool visible)
ev.time() - src->natural_position() + _region->start());
if (ev.type() == MIDI_CMD_NOTE_ON) {
- boost::shared_ptr<NoteType> note (
- new NoteType (ev.channel(), time_beats, Temporal::Beats(), ev.note(), ev.velocity()));
+
+ boost::shared_ptr<NoteType> note (new NoteType (ev.channel(), time_beats, std::numeric_limits<Temporal::Beats>::max() - time_beats, ev.note(), ev.velocity()));
+
+ assert (note->end_time() == std::numeric_limits<Temporal::Beats>::max());
add_note (note, true);
projects / ardour.git / blobdiff