smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

Clean up snap-to code in various places. Fix a couple of typos. Should fix #3165 and #3172.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7152 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-05-25 00:35:53 +00:00
parent bd2cbe9e76
commit e3b0cb086d
4 changed files with 101 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

75
gtk2_ardour/editor_rulers.cc
View file

@ -1153,56 +1153,59 @@ Editor::compute_bbt_ruler_scale (nframes64_t lower, nframes64_t upper)
bbt_ruler_scale = bbt_over;
switch (_snap_type) {
case SnapToBeatDiv2:
bbt_beat_subdivision = 2;
break;
case SnapToBeatDiv3:
bbt_beat_subdivision = 3;
break;
case SnapToBeatDiv4:
bbt_beat_subdivision = 4;
break;
case SnapToBeatDiv8:
bbt_beat_subdivision = 8;
bbt_accent_modulo = 2;
break;
case SnapToBeatDiv16:
bbt_beat_subdivision = 16;
bbt_accent_modulo = 4;
break;
case SnapToBeatDiv32:
bbt_beat_subdivision = 32;
bbt_accent_modulo = 8;
break;
case SnapToBeatDiv28:
bbt_beat_subdivision = 28;
bbt_accent_modulo = 7;
break;
case SnapToBeatDiv24:
bbt_beat_subdivision = 24;
bbt_accent_modulo = 6;
break;
case SnapToBeatDiv14:
bbt_beat_subdivision = 14;
bbt_accent_modulo = 3; // XXX YIKES!
break;
case SnapToBeatDiv12:
bbt_beat_subdivision = 12;
bbt_accent_modulo = 3;
break;
case SnapToBeatDiv10:
bbt_beat_subdivision = 10;
bbt_accent_modulo = 2; // XXX YIKES
break;
case SnapToBeatDiv7:
bbt_beat_subdivision = 7;
case SnapToBeatDiv5:
bbt_beat_subdivision = 5;
bbt_accent_modulo = 2; // XXX YIKES
break;
case SnapToBeatDiv6:
bbt_beat_subdivision = 6;
bbt_accent_modulo = 2; // XXX YIKES
break;
case SnapToBeatDiv5:
bbt_beat_subdivision = 5;
case SnapToBeatDiv7:
bbt_beat_subdivision = 7;
bbt_accent_modulo = 2; // XXX YIKES
break;
case SnapToBeatDiv8:
bbt_beat_subdivision = 8;
bbt_accent_modulo = 2;
break;
case SnapToBeatDiv10:
bbt_beat_subdivision = 10;
bbt_accent_modulo = 2; // XXX YIKES
break;
case SnapToBeatDiv12:
bbt_beat_subdivision = 12;
bbt_accent_modulo = 3;
break;
case SnapToBeatDiv14:
bbt_beat_subdivision = 14;
bbt_accent_modulo = 3; // XXX YIKES!
break;
case SnapToBeatDiv16:
bbt_beat_subdivision = 16;
bbt_accent_modulo = 4;
break;
case SnapToBeatDiv24:
bbt_beat_subdivision = 24;
bbt_accent_modulo = 6;
break;
case SnapToBeatDiv28:
bbt_beat_subdivision = 28;
bbt_accent_modulo = 7;
break;
case SnapToBeatDiv32:
bbt_beat_subdivision = 32;
bbt_accent_modulo = 8;
break;
default:
bbt_beat_subdivision = 4;
break;