X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fediting.h;h=1145e76b40ddcb98b14234cd505d35b0532fab4d;hb=79731a716deae9a90be646695480f06f92c268f5;hp=6bc575116ba78e1da3e1c85f56ae4b8104a9f7d7;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/editing.h b/gtk2_ardour/editing.h
index 6bc575116b..1145e76b40 100644
--- 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
@@ -196,6 +196,7 @@ enum InsertTimeOption {
 /////////////////////
 // These don't need their state saved. yet...
 enum CutCopyOp {
+	Delete,
 	Cut,
 	Copy,
 	Clear
@@ -207,6 +208,26 @@ enum XFadeType {
 	At
 };
 
+enum EditIgnoreOption {
+	EDIT_IGNORE_NONE,
+	EDIT_IGNORE_PHEAD,
+	EDIT_IGNORE_MOUSE,
+	EDIT_IGNORE_MARKER
+};
+
+enum ZoomAxis {
+	Vertical,
+	Horizontal,
+	Both
+};
+
+enum RegionActionTarget {
+	SelectedRegions = 0x1,
+	EnteredRegions = 0x2,
+	EditPointRegions = 0x4,
+	ListSelection = 0x8
+};
+
 } // namespace Editing
 
 #endif // __gtk_ardour_editing_h__