midi_region_view::apply_diff: implement using renamed midi_model functions
This commit is contained in:
parent
9fcf8b3a11
commit
133600d5dc
|
@ -988,8 +988,6 @@ MidiRegionView::note_diff_add_change (NoteBase* ev,
|
||||||
void
|
void
|
||||||
MidiRegionView::apply_diff (bool as_subcommand, bool was_copy)
|
MidiRegionView::apply_diff (bool as_subcommand, bool was_copy)
|
||||||
{
|
{
|
||||||
bool commit = false;
|
|
||||||
|
|
||||||
if (!_note_diff_command) {
|
if (!_note_diff_command) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -1003,11 +1001,11 @@ MidiRegionView::apply_diff (bool as_subcommand, bool was_copy)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (as_subcommand) {
|
/*note that we don't use as_commit here, because that would BEGIN a new undo record; we already have one underway*/
|
||||||
_model->apply_command_as_subcommand (*trackview.session(), _note_diff_command);
|
_model->apply_diff_command_as_subcommand (*trackview.session(), _note_diff_command);
|
||||||
} else {
|
|
||||||
_model->apply_command (*trackview.session(), _note_diff_command);
|
if (!as_subcommand) {
|
||||||
commit = true;
|
trackview.editor().commit_reversible_command (); /*instead, we can explicitly commit the command in progress */
|
||||||
}
|
}
|
||||||
|
|
||||||
_note_diff_command = 0;
|
_note_diff_command = 0;
|
||||||
|
@ -1017,10 +1015,6 @@ MidiRegionView::apply_diff (bool as_subcommand, bool was_copy)
|
||||||
}
|
}
|
||||||
|
|
||||||
_marked_for_velocity.clear();
|
_marked_for_velocity.clear();
|
||||||
|
|
||||||
if (commit) {
|
|
||||||
trackview.editor().commit_reversible_command ();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in New Issue