summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_rulers.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-05-13 18:51:59 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-05-13 18:51:59 +0000
commitec01a25ec1dfefbd6918801a354fde024a94a586 (patch)
treef58fc49765ac94fef4dfe330bef38b804e8bd728 /gtk2_ardour/editor_rulers.cc
parent5670e2c3a4732ed7325620713f006c5b93f44a72 (diff)
add 8 more beat subdivisions, as per #3126
git-svn-id: svn://localhost/ardour2/branches/3.0@7099 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_rulers.cc')
-rw-r--r--gtk2_ardour/editor_rulers.cc42
1 files changed, 37 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 73ffcb4467..79ea23815d 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -1153,24 +1153,56 @@ Editor::compute_bbt_ruler_scale (nframes64_t lower, nframes64_t upper)
bbt_ruler_scale = bbt_over;
switch (_snap_type) {
- case SnapToAThirdBeat:
+ case SnapToBeatDiv3:
bbt_beat_subdivision = 3;
break;
- case SnapToAQuarterBeat:
+ case SnapToBeatDiv4:
bbt_beat_subdivision = 4;
break;
- case SnapToAEighthBeat:
+ case SnapToBeatDiv8:
bbt_beat_subdivision = 8;
bbt_accent_modulo = 2;
break;
- case SnapToASixteenthBeat:
+ case SnapToBeatDiv16:
bbt_beat_subdivision = 16;
bbt_accent_modulo = 4;
break;
- case SnapToAThirtysecondBeat:
+ 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;
+ 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;
+ bbt_accent_modulo = 2; // XXX YIKES
+ break;
default:
bbt_beat_subdivision = 4;
break;