diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-05-25 00:35:53 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-05-25 00:35:53 +0000 |
| commit | e3b0cb086d2cec5f28a24fed16fd62e06080fe1a (patch) | |
| tree | a72693675a3932bd3b586c14b4da02efe31b44e3 /gtk2_ardour/editor_rulers.cc | |
| parent | bd2cbe9e76b28d5cc3d9688c7df6c5206d6be771 (diff) | |
Clean up snap-to code in various places. Fix a couple of typos. Should fix #3165 and #3172.
git-svn-id: svn://localhost/ardour2/branches/3.0@7152 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_rulers.cc')
| -rw-r--r-- | gtk2_ardour/editor_rulers.cc | 63 |
1 files changed, 33 insertions, 30 deletions
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 79ea23815d..873e491958 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -1153,55 +1153,58 @@ 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 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 SnapToBeatDiv7: + bbt_beat_subdivision = 7; + bbt_accent_modulo = 2; // XXX YIKES + 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; + case SnapToBeatDiv10: + bbt_beat_subdivision = 10; + bbt_accent_modulo = 2; // XXX YIKES break; - case SnapToBeatDiv24: - bbt_beat_subdivision = 24; - bbt_accent_modulo = 6; + 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 SnapToBeatDiv12: - bbt_beat_subdivision = 12; - bbt_accent_modulo = 3; - break; - case SnapToBeatDiv10: - bbt_beat_subdivision = 10; - bbt_accent_modulo = 2; // XXX YIKES + case SnapToBeatDiv16: + bbt_beat_subdivision = 16; + bbt_accent_modulo = 4; break; - case SnapToBeatDiv7: - bbt_beat_subdivision = 7; - bbt_accent_modulo = 2; // XXX YIKES + case SnapToBeatDiv24: + bbt_beat_subdivision = 24; + bbt_accent_modulo = 6; break; - case SnapToBeatDiv6: - bbt_beat_subdivision = 6; - bbt_accent_modulo = 2; // XXX YIKES + case SnapToBeatDiv28: + bbt_beat_subdivision = 28; + bbt_accent_modulo = 7; break; - case SnapToBeatDiv5: - bbt_beat_subdivision = 5; - bbt_accent_modulo = 2; // XXX YIKES + case SnapToBeatDiv32: + bbt_beat_subdivision = 32; + bbt_accent_modulo = 8; break; default: bbt_beat_subdivision = 4; |