ardour/livetrax
13
0
Fork 0
Code

snap: fix quintuplets and septuplets 2x factor

Browse Source 
grid: fix quintuplets 2x factor (septuplets still don't draw properly)
This commit is contained in:
jean-emmanuel 2024-02-25 21:18:29 +01:00 committed by Robin Gareus
parent f190493e32
commit af023cc516
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/editor.cc
View File

@ -3069,7 +3069,7 @@ Editor::_snap_to_bbt (timepos_t const & presnap, Temporal::RoundMode direction,
* for the snap, based on the grid setting. * for the snap, based on the grid setting.
*/ */
int divisor; float divisor;
switch (_grid_type) { switch (_grid_type) {
case GridTypeBeatDiv3: case GridTypeBeatDiv3:
case GridTypeBeatDiv6: case GridTypeBeatDiv6:
@ -3080,12 +3080,12 @@ Editor::_snap_to_bbt (timepos_t const & presnap, Temporal::RoundMode direction,
case GridTypeBeatDiv5: case GridTypeBeatDiv5:
case GridTypeBeatDiv10: case GridTypeBeatDiv10:
case GridTypeBeatDiv20: case GridTypeBeatDiv20:
divisor = 5; divisor = 2.5;
break; break;
case GridTypeBeatDiv7: case GridTypeBeatDiv7:
case GridTypeBeatDiv14: case GridTypeBeatDiv14:
case GridTypeBeatDiv28: case GridTypeBeatDiv28:
divisor = 7; divisor = 3.5;
break; break;
case GridTypeBeat: case GridTypeBeat:
divisor = 1; divisor = 1;

6
gtk2_ardour/editor_tempodisplay.cc
View File

@ -358,7 +358,7 @@ Editor::compute_current_bbt_points (Temporal::TempoMapPoints& grid, samplepos_t
const Beats lower_beat = (left < Beats() ? Beats() : left); const Beats lower_beat = (left < Beats() ? Beats() : left);
const samplecnt_t sr (_session->sample_rate()); const samplecnt_t sr (_session->sample_rate());
int divisor; float divisor;
switch (_grid_type) { switch (_grid_type) {
case GridTypeBeatDiv3: case GridTypeBeatDiv3:
case GridTypeBeatDiv6: case GridTypeBeatDiv6:
@ -369,12 +369,12 @@ Editor::compute_current_bbt_points (Temporal::TempoMapPoints& grid, samplepos_t
case GridTypeBeatDiv5: case GridTypeBeatDiv5:
case GridTypeBeatDiv10: case GridTypeBeatDiv10:
case GridTypeBeatDiv20: case GridTypeBeatDiv20:
divisor = 5; divisor = 2.5;
break; break;
case GridTypeBeatDiv7: case GridTypeBeatDiv7:
case GridTypeBeatDiv14: case GridTypeBeatDiv14:
case GridTypeBeatDiv28: case GridTypeBeatDiv28:
divisor = 7; divisor = 3.5;
break; break;
default: default:
divisor = 2; divisor = 2;