ardour/livetrax
13
0
Fork 0
Code

MIDI Draw: fix thinko in length=Auto

Browse Source
This commit is contained in:
Ben Loftis 2021-11-19 10:28:17 -06:00
parent bc6766fc3f
commit ca7e133e3d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk2_ardour/editor.cc
View File

@ -4387,7 +4387,8 @@ Editor::get_draw_length_as_beats (bool& success, timepos_t const & position)
{ {
success = true; success = true;
const unsigned divisions = get_grid_beat_divisions (DRAW_LEN_AUTO ? _grid_type : _draw_length); GridType grid_to_use = draw_length() == DRAW_LEN_AUTO ? grid_type() : draw_length();
const unsigned divisions = get_grid_beat_divisions (grid_to_use);
if (divisions) { if (divisions) {
return Temporal::Beats::from_double (1.0 / (double) divisions); return Temporal::Beats::from_double (1.0 / (double) divisions);
} }

6
gtk2_ardour/editor_drag.cc
View File

@ -7027,7 +7027,8 @@ NoteCreateDrag::finished (GdkEvent* ev, bool had_movement)
Beats const start = _region_view->region()->absolute_time_to_region_beats (min (_note[0], _note[1])); Beats const start = _region_view->region()->absolute_time_to_region_beats (min (_note[0], _note[1]));
Beats length = max (Beats (0, 1), (_note[0].distance (_note[1]).abs().beats())); Beats length = max (Beats (0, 1), (_note[0].distance (_note[1]).abs().beats()));
int32_t div = _editor->get_grid_music_divisions (_editor->draw_length(), ev->button.state); GridType grid_to_use = _editor->draw_length() == DRAW_LEN_AUTO ? _editor->grid_type() : _editor->draw_length();
int32_t div = _editor->get_grid_music_divisions (grid_to_use, ev->button.state);
if (div > 0) { if (div > 0) {
length = length.round_to_subdivision (div, RoundUpMaybe); length = length.round_to_subdivision (div, RoundUpMaybe);
@ -7098,7 +7099,8 @@ HitCreateDrag::motion (GdkEvent* event, bool)
{ {
const timepos_t pos = _drags->current_pointer_time (); const timepos_t pos = _drags->current_pointer_time ();
const int32_t divisions = _editor->get_grid_music_divisions (_editor->draw_length(), event->button.state); GridType grid_to_use = _editor->draw_length() == DRAW_LEN_AUTO ? _editor->grid_type() : _editor->draw_length();
int32_t divisions = _editor->get_grid_music_divisions (grid_to_use, event->button.state);
if (divisions <= 0) { if (divisions <= 0) {
return; return;
} }