ardour/livetrax
13
0
Fork 0
Code

fix various issues when deleting midi region during step-edit

Browse Source 
fixes #6404
This commit is contained in:
Robin Gareus 2015-07-04 12:33:10 +02:00
parent a68221e323
commit cba7d37107
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk2_ardour/step_editor.cc
View File

@ -226,6 +226,9 @@ StepEditor::step_edit_sustain (Evoral::Beats beats)
void
StepEditor::move_step_edit_beat_pos (Evoral::Beats beats)
{
if (!step_edit_region_view) {
return;
}
if (beats > 0.0) {
step_edit_beat_pos = min (step_edit_beat_pos + beats,
step_edit_region_view->region_frames_to_region_beats (step_edit_region->length()));
@ -356,8 +359,10 @@ StepEditor::step_edit_toggle_chord ()
{
if (_step_edit_within_chord) {
_step_edit_within_chord = false;
step_edit_beat_pos += _step_edit_chord_duration;
step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos);
if (step_edit_region_view) {
step_edit_beat_pos += _step_edit_chord_duration;
step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos);
}
} else {
_step_edit_triplet_countdown = 0;
_step_edit_within_chord = true;
@ -375,7 +380,7 @@ StepEditor::step_edit_rest (Evoral::Beats beats)
success = true;
}
if (success) {
if (success && step_edit_region_view) {
step_edit_beat_pos += beats;
step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos);
}
@ -385,7 +390,9 @@ void
StepEditor::step_edit_beat_sync ()
{
step_edit_beat_pos = step_edit_beat_pos.round_up_to_beat();
step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos);
if (step_edit_region_view) {
step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos);
}
}
void