X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fquantize_dialog.cc;h=b29e9f32613757e857c899ea163f11ee51034d5b;hb=2dc3c8b3650266eba09cf7fe53c39c6728d4d5b6;hp=dd7bd1affc22b272955947c1e89d73f094db49b4;hpb=187748874c288321f3197fb1e3dfb64f86c9c0bf;p=ardour.git

diff --git a/gtk2_ardour/quantize_dialog.cc b/gtk2_ardour/quantize_dialog.cc
index dd7bd1affc..b29e9f3261 100644
--- a/gtk2_ardour/quantize_dialog.cc
+++ b/gtk2_ardour/quantize_dialog.cc
@@ -33,32 +33,35 @@ using namespace Gtkmm2ext;
 using namespace ARDOUR;
 
 static const gchar *_grid_strings[] = {
-	N_("main grid"),
-	N_("Beats/128"),
-	N_("Beats/64"),
-	N_("Beats/32"),
-	N_("Beats/28"),
-	N_("Beats/24"),
-	N_("Beats/20"),
-	N_("Beats/16"),
-	N_("Beats/14"),
-	N_("Beats/12"),
-	N_("Beats/10"),
-	N_("Beats/8"),
-	N_("Beats/7"),
-	N_("Beats/6"),
-	N_("Beats/5"),
-	N_("Beats/4"),
-	N_("Beats/3"),
-	N_("Beats/2"),
-	N_("Beats"),
+	N_("Main Grid"),
+	N_("1/4 Note"),
+	N_("1/8 Note"),
+	N_("1/16 Note"),
+	N_("1/32 Note"),
+	N_("1/64 Note"),
+	N_("1/128 Note"),
+	
+	N_("1/3 (8th triplet)"),
+	N_("1/6 (16th triplet)"),
+	N_("1/12 (32nd triplet)"),
+
+	N_("1/5 (8th quintuplet)"),
+	N_("1/10 (16th quintuplet)"),
+	N_("1/20 (32nd quintuplet)"),
+
+	N_("1/7 (8th septuplet)"),
+	N_("1/14 (16th septuplet)"),
+	N_("1/28 (32nd septuplet)"),
+
 	0
 };
 
 static const int _grid_beats[] = {
 	0,
-	128, 64, 32, 28, 24, 20, 16, 14,
-	12, 10, 8, 7, 6, 5, 4, 3, 2, 1,
+	1, 2, 4, 8, 16, 32,
+	3, 6, 12,
+	5, 10, 20,
+	7, 14, 28,
 	0
 };
 
@@ -144,10 +147,10 @@ QuantizeDialog::end_grid_size () const
 double
 QuantizeDialog::grid_size_to_musical_time (const string& txt) const
 {
-	if (txt == _("main grid")) {
+	if ( txt == _grid_strings[0] ) {  //"Main Grid"
 		bool success;
 
-		Evoral::Beats b = editor.get_grid_type_as_beats (success, 0);
+		Temporal::Beats b = editor.get_grid_type_as_beats (success, 0);
 		if (!success) {
 			return 1.0;
 		}