new_grid: Rewrite of Snap and Grid. (squashed commit)

[ardour.git] / gtk2_ardour / editing.h

diff --git a/gtk2_ardour/editing.h b/gtk2_ardour/editing.h
index 5558f1946040ec9dfd5877ec2e90a9064b029e1f..1145e76b40ddcb98b14234cd505d35b0532fab4d 100644 (file)
--- a/gtk2_ardour/editing.h
+++ b/gtk2_ardour/editing.h
@@ -26,7 +26,7 @@
 
 // This involves some cpp magic. --taybin
 
-#define SNAPTYPE(a) /*empty*/
+#define GRIDTYPE(a) /*empty*/
 #define SNAPMODE(a) /*empty*/
 #define REGIONLISTSORTTYPE(a) /*empty*/
 #define MOUSEMODE(a) /*empty*/
@@ -43,19 +43,19 @@
 
 namespace Editing {
 
-// SNAPTYPE
-#undef SNAPTYPE
-#define SNAPTYPE(a) a,
-enum SnapType {
+// GRIDTYPE
+#undef GRIDTYPE
+#define GRIDTYPE(a) a,
+enum GridType {
        #include "editing_syms.h"
 };
 
-extern const char *snaptypestrs[];
-inline const char* enum2str(SnapType m) {return snaptypestrs[m];}
-SnapType str2snaptype(const std::string &);
+extern const char *gridtypestrs[];
+inline const char* enum2str(GridType m) {return gridtypestrs[m];}
+GridType str2gridtype(const std::string &);
 
-#undef SNAPTYPE
-#define SNAPTYPE(a) /*empty*/
+#undef GRIDTYPE
+#define GRIDTYPE(a) /*empty*/
 
 // SNAPMODE
 #undef SNAPMODE