changes required to operate with the Evoral::Beats ticktime commit
This commit is contained in:
parent
6f553ce988
commit
e37558502e
@ -4301,7 +4301,7 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid
|
|||||||
|
|
||||||
/* Snap start time backwards, so copy/paste is snap aligned. */
|
/* Snap start time backwards, so copy/paste is snap aligned. */
|
||||||
if (midi) {
|
if (midi) {
|
||||||
if (earliest == Evoral::Beats::max()) {
|
if (earliest == std::numeric_limits<Evoral::Beats>::max()) {
|
||||||
earliest = Evoral::Beats(); // Weird... don't offset
|
earliest = Evoral::Beats(); // Weird... don't offset
|
||||||
}
|
}
|
||||||
earliest.round_down_to_beat();
|
earliest.round_down_to_beat();
|
||||||
@ -4369,7 +4369,7 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid
|
|||||||
void
|
void
|
||||||
Editor::cut_copy_midi (CutCopyOp op)
|
Editor::cut_copy_midi (CutCopyOp op)
|
||||||
{
|
{
|
||||||
Evoral::Beats earliest = Evoral::Beats::max();
|
Evoral::Beats earliest = std::numeric_limits<Evoral::Beats>::max();
|
||||||
for (MidiRegionSelection::iterator i = selection->midi_regions.begin(); i != selection->midi_regions.end(); ++i) {
|
for (MidiRegionSelection::iterator i = selection->midi_regions.begin(); i != selection->midi_regions.end(); ++i) {
|
||||||
MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
|
MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
|
||||||
if (mrv) {
|
if (mrv) {
|
||||||
|
@ -1424,11 +1424,13 @@ MidiRegionView::display_sysexes()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Show unless message is beyond the region bounds
|
// Show unless message is beyond the region bounds
|
||||||
if (time - _region->start() >= _region->length() || time < _region->start()) {
|
// XXX REQUIRES APPROPRIATE OPERATORS FOR Evoral::Beats and framepos? say what?
|
||||||
sysex->hide();
|
#warning paul fix this
|
||||||
} else {
|
// if (time - _region->start() >= _region->length() || time < _region->start()) {
|
||||||
sysex->show();
|
// sysex->hide();
|
||||||
}
|
// } else {
|
||||||
|
// sysex->show();
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2395,7 +2397,7 @@ MidiRegionView::note_selected (NoteBase* ev, bool add, bool extend)
|
|||||||
} else {
|
} else {
|
||||||
/* find end of latest note selected, select all between that and the start of "ev" */
|
/* find end of latest note selected, select all between that and the start of "ev" */
|
||||||
|
|
||||||
Evoral::Beats earliest = Evoral::MaxBeats;
|
Evoral::Beats earliest = std::numeric_limits<Evoral::Beats>::max();
|
||||||
Evoral::Beats latest = Evoral::Beats();
|
Evoral::Beats latest = Evoral::Beats();
|
||||||
|
|
||||||
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
|
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
|
||||||
@ -2551,7 +2553,7 @@ MidiRegionView::add_to_selection (NoteBase* ev)
|
|||||||
Evoral::Beats
|
Evoral::Beats
|
||||||
MidiRegionView::earliest_in_selection ()
|
MidiRegionView::earliest_in_selection ()
|
||||||
{
|
{
|
||||||
Evoral::Beats earliest = Evoral::MaxBeats;
|
Evoral::Beats earliest = std::numeric_limits<Evoral::Beats>::max();
|
||||||
|
|
||||||
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
|
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
|
||||||
if ((*i)->note()->time() < earliest) {
|
if ((*i)->note()->time() < earliest) {
|
||||||
|
Loading…
Reference in New Issue
Block a user